Pedro Beschorner Marin d6b1dd09b9 Merge remote-tracking branch 'mconf-akka-transcoding' into 1.1-transcode ... Conflicts: akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/VideoApp.scala		2017-06-08 18:57:37 +00:00
..
app	Merge remote-tracking branch 'mconf-akka-transcoding' into 1.1-transcode	2017-06-08 18:57:37 +00:00
applet	Branding back to BigBlueButton and adding back some of the client images we removed. This need to be reviewed to avoid having all this unused images!	2017-04-03 17:06:16 +00:00
common	After checking we bumped projects version and Flex locales to 0.9.0 with some fixes	2014-08-13 12:20:10 +01:00
.gitignore	- cleanup	2010-09-08 17:14:42 -04:00
build.gradle	- update jar to latest red5	2015-08-10 21:32:00 +00:00
settings.gradle	copying from dev branch to trunk	2009-10-23 14:47:31 +00:00
vm-build.sh	Stability issues with module loader in flex client and deskshare/vm-build.sh script for local devel	2010-06-29 05:07:00 +00:00