BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7d401dab53
bigbluebutton-Github/bigbluebutton-web/grails-app/services/org/bigbluebutton/web
History
Lucas Zawacki 7d401dab53 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-with-tests 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
2014-11-14 15:33:17 -02:00
..
services Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-with-tests 2014-11-14 15:33:17 -02:00