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
..
air-client	Merge remote-tracking branch 'bigbluebutton/master' into mobile-no-force-debug	2018-09-13 09:25:40 +01:00
web-client	Implement echo test view.	2018-02-21 19:42:00 +01:00
build.gradle	Add 'flashbuilder' plugin to clients/flash/build.gradle	2016-12-06 16:11:06 -02:00
settings.gradle	Removing building of air client for now.	2016-03-31 16:48:19 +00:00