Ghazi Triki 7d283cd154 Merge remote-tracking branch 'bigbluebutton/master' into merge-master-into-2x ... # Conflicts: # bigbluebutton-client/resources/config.xml.template # bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as # bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml # record-and-playback/core/scripts/rap-process-worker.rb		2017-05-22 17:35:24 +01:00
..
css	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00
images	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00
js	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00
WEB-INF	Merge remote-tracking branch 'bigbluebutton/master' into merge-master-into-2x	2017-05-22 17:35:24 +01:00