Ghazi Triki 0385d05001 Merge branch 'master' into breakout-rooms-porto-algre-2015 ... # Conflicts: # akka-bbb-apps/build.sbt # akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala # akka-bbb-fsesl/build.sbt # bbb-common-message/build.sbt # bigbluebutton-apps/build.gradle # bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java # bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as # bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as		2016-01-27 14:16:05 +01:00
..
.settings	- start implementing breakout room messages	2015-10-15 23:05:19 +00:00
grails-app	Merge branch 'master' into breakout-rooms-porto-algre-2015	2016-01-27 14:16:05 +01:00
lib	- follow redirects when downloading presentation	2014-10-22 02:43:03 -07:00
src	Merge branch 'master' into breakout-rooms-porto-algre-2015	2016-01-27 14:16:05 +01: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	- distinguish breakout rooms in create meeting request	2015-10-22 19:36:20 +00:00
.gitignore	Added bin folder to bigbluebutton-web/.gitignore	2015-11-03 21:49:21 +01: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	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merge-master-into-ghazi	2016-01-07 22:58:04 +00: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