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
..
grails-app	Moving the meeting life cycle management from bbb-web to akka-apps	2017-05-03 17:02:16 +00:00
lib	Clean dependencies for bigbluebutton-web.	2017-04-18 17:16:57 +01:00
src	Removed bbb-web a domain file that was already moved to bbb-common-web	2017-05-04 15:24:06 +00:00
test	Merge remote-tracking branch 'mconf/mconf'	2017-03-20 19:45:59 +00:00
web-app	Merge remote-tracking branch 'bigbluebutton/master' into merge-master-into-2x	2017-05-22 17:35:24 +01:00
wrapper	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00
.gitignore	Merging breakout rooms with the master branch	2016-03-21 17:52:23 +00:00
application.properties	upgrade grails from 2.3.6 to 2.5.2	2016-03-08 21:43:35 +00:00
build.gradle	Merge branch 'master' into bbb-2x-mconf	2017-04-25 07:40:30 -07:00
COPYING.LESSER	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00
grailsw	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00
grailsw.bat	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00
INSTALL	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00