Ghazi Triki cc2cdd276d Merge remote-tracking branch 'jfsiebel/bbb-rtmp-player-ios' into ios-h264 ... # Conflicts: # clients/flash/air-client/src/org/bigbluebutton/air/common/views/IOSVideoView.as		2018-06-18 14:12:29 +01:00
..
air-client	Merge remote-tracking branch 'jfsiebel/bbb-rtmp-player-ios' into ios-h264	2018-06-18 14:12:29 +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