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
..
bbb-redis-messaging.xml	- add ping/pong message between different components to verfiy that we have working path	2015-08-20 20:44:40 +00:00
bbb-redis-pool.xml	- add ping/pong message between different components to verfiy that we have working path	2015-08-20 20:44:40 +00:00
doc-conversion.xml	- change how we process upload presentation. Before, an uploaded presentation consumes all of the	2016-01-21 17:24:13 +00:00
resources.groovy	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00
resources.xml	- create breakout room in bbb-web	2015-10-22 17:13:53 +00:00
turn-stun-servers.xml	Use configured stun/turn servers when making webrtc call	2015-02-17 12:00:04 -05:00