BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4172537f24
bigbluebutton-Github/bigbluebutton-apps/src/main
History
Anton Georgiev 4172537f24 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into meteor-merge-with-m 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-app.xml
2014-11-28 20:33:11 +00:00
..
java/org/bigbluebutton Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into meteor-merge-with-m 2014-11-28 20:33:11 +00:00
resources - try to fix why BBB apps isn't starting 2014-04-14 10:44:25 -07:00
scala/org/bigbluebutton Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into meteor-merge-with-m 2014-11-28 20:33:11 +00:00
webapp/WEB-INF Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into meteor-merge-with-m 2014-11-28 20:33:11 +00:00