BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
adf20cca7d
bigbluebutton-Github/bigbluebutton-web
History
Anton Georgiev adf20cca7d Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merging-html5-with-master 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.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/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala
2014-08-20 15:24:25 +00:00
..
.settings - refactor presentation classes from groovy to java...java has better tool support for eclipse 2009-12-22 21:06:23 +00:00
grails-app Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merging-html5-with-master 2014-08-20 15:24:25 +00:00
lib - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
src Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merging-html5-with-master 2014-08-20 15:24:25 +00:00
test - cleanup. We'll have to re-implement these tests 2014-07-30 14:26:39 -07:00
web-app - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
wrapper - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
.classpath added config file for jedispool 2011-12-12 15:18:52 -08:00
.gitignore - merge some new stuff 2012-07-29 16:06:39 +00:00
application.properties After checking we bumped projects version and Flex locales to 0.9.0 with some fixes 2014-08-13 12:20:10 +01:00
build.gradle - changing dependecies seems to have broken the build 2014-07-30 13:19:03 -07:00
COPYING.LESSER - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
grailsw - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
grailsw.bat - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
INSTALL - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00