Ghazi Triki 845ffc8343 Merge remote-tracking branch 'bigbluebutton/master' into mobile-no-force-debug ... # Conflicts: # clients/flash/air-client/src/org/bigbluebutton/air/main/views/LoadingScreenMediator.as		2018-09-13 09:25:40 +01:00
..
.settings
libs	[AIR] move common-library files under air-client	2018-03-02 15:39:24 -08:00
locale	Improved user status components in mobile.	2016-04-18 15:43:04 +01:00
src	Merge remote-tracking branch 'bigbluebutton/master' into mobile-no-force-debug	2018-09-13 09:25:40 +01:00
.gitignore
build-locale.bat
build.gradle
generate_css_dpi.sh	More improvements to the configuration parsing.	2017-05-25 11:57:51 +01:00
used-resource-bundles.txt