BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f6d6e4e40c
bigbluebutton-Github/bigbluebutton-web/grails-app
History
Felipe Cecagno f6d6e4e40c Merge branch '090-guest-role' into HEAD 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	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/core/api/MessageNames.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
2015-01-25 18:36:30 -02:00
..
conf Added config pngImagesRequired. If true, the slides will be converted to png for HTML5 client. False by default. 2015-01-09 16:14:05 +00:00
controllers/org/bigbluebutton/web/controllers Merge branch '090-guest-role' into HEAD 2015-01-25 18:36:30 -02:00
i18n - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
services/org/bigbluebutton/web/services Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-with-tests 2014-11-14 15:33:17 -02:00
views - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00