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
..
conf	Merge branch 'master' into breakout-rooms-porto-algre-2015	2016-01-27 14:16:05 +01:00
controllers/org/bigbluebutton/web/controllers	Fixed issue by assigning a value to a non existing iSbreakout property to UserSession class.	2016-01-16 18:30:17 +01:00
i18n	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00
services/org/bigbluebutton/web/services	- remove printlns to cleanup logs	2015-09-23 20:11:06 +00:00
views	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00