BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
66392e0a6b
bigbluebutton-Github/bigbluebutton-web/grails-app
History
Felipe Cecagno 66392e0a6b Merge remote-tracking branch 'mconf/mconf-live0.7.4' into mconf 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
2016-03-02 00:19:30 -03:00
..
conf Merge remote-tracking branch 'bigbluebutton/master' into mconf 2016-01-26 18:33:31 -02:00
controllers/org/bigbluebutton/web/controllers Merge remote-tracking branch 'mconf/mconf-live0.7.4' into mconf 2016-03-02 00:19:30 -03:00
i18n - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
services/org/bigbluebutton/web/services Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf-live0.7.3-merge 2015-11-25 15:58:36 +00:00
views - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00