Ghazi Triki 186417fb6f Merge branch 'master-v2' into 2x-client-theme ... # Conflicts: # bigbluebutton-client/src/org/bigbluebutton/common/Images.as # bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatControlBar.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/WebRTCDesktopPublishWindow.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml		2017-07-18 18:38:46 +01:00
..
am
am_ET
ar
ar_EG
ar_SA
ar_SY
az_AZ
be_BY
bg_BG
bn_BN
bn_IN
bs_BA
ca_ES
cs_CZ
cy_GB
da_DK
de
de_DE
el
el_GR
en_AU
en_US	Merge branch 'master-v2' into 2x-client-theme	2017-07-18 18:38:46 +01:00
es_419
es_CL
es_ES
es_LA
et_EE
eu_ES
eu_EU
fa
fa_IR
ff_SN
fi_FI
fr
fr_CA
fr_FR
gl
gl_ES
he_IL
hi
hr_HR
hu_HU
hy
hy_AM
id_ID
it_IT
ja
ja_JP
ka
ka_GE
kk_KZ
km_KH
ko_KR
lt
lt_LT
lv_LV
mk
mk_MK
ml_IN
mn_MN
ms_MY
nb_NO
ne_NE
ne_NP
nl
nl_BE
nl_NL
no_NO
nqo
oc
or_IN
pl_PL
pt_BR
pt_PT
ro_RO
ru_lv
ru_RU
si_LK
sk_SK
sl_SI
sl_SL
sq
sr_RS
sr_SR
sv_SE
te
th_TH
tr
tr_TR
uk_UA
uz
vi
vi_VN
zh_CN
zh_TW
.gitignore