BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6018ff2290
bigbluebutton-Github/bigbluebutton-apps/src/main
History
Richard Alam 6018ff2290 Merge branch 'encode-decode-json' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationMessageListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/Red5BBBInGw.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
2015-05-22 20:41:34 +00:00
..
java/org/bigbluebutton Merge branch 'encode-decode-json' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11 2015-05-22 20:41:34 +00:00
resources Merge branch 'encode-decode-json' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11 2015-05-21 16:17:47 -07:00
scala/org/bigbluebutton Merge branch 'encode-decode-json' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11 2015-05-22 20:41:34 +00:00
webapp/WEB-INF Merge branch 'encode-decode-json' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11 2015-05-22 20:41:34 +00:00