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
..
.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	authToken is now different than userid	2014-11-20 19:09:41 +00:00
lib	- follow redirects when downloading presentation	2014-10-22 02:43:03 -07:00
src	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into meteor-merge-with-m	2014-11-28 20:33:11 +00:00
test	sending the externalMeetingId from bbb-web to bbb-apps, so bbb-apps can use it on redis pubsub message meeting_created_message	2014-11-11 17:54:17 -02: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	- modify lib path	2014-10-22 02:44:15 -07: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	- follow redirects when downloading presentation	2014-10-22 02:43: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