bigbluebutton-Github/bbb-common-message
Pedro Beschorner Marin cd34d2c139 Merge remote-tracking branch 'bbb-2x-mconf' into transcode-new-messages
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
2017-07-25 14:47:21 +00:00
..
project - create a common message project 2015-06-10 15:53:07 +00:00
src Merge remote-tracking branch 'bbb-2x-mconf' into transcode-new-messages 2017-07-25 14:47:21 +00:00
.gitignore - create a common message project 2015-06-10 15:53:07 +00:00
build.sbt - add Jackson Json dependencies 2017-05-09 14:19:22 -07:00
deploy.sh - some util scripts 2017-06-16 10:07:47 -07:00
README.md - remove messages from bbb-apps red5 2015-06-10 17:11:36 +00:00