Skip to content
Snippets Groups Projects
Commit 5c0cb9c3 authored by Maxim Khlobystov's avatar Maxim Khlobystov
Browse files

Merge branch 'meteor-client-pdf-conversion' of... 

Merge branch 'meteor-client-pdf-conversion' of https://github.com/gthacoder/bigbluebutton into development

Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PresentationEventRedisRecorder.scala
parents 8a85e0b3 68529c8c
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 68 additions and 68 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

gitlab project and software management by fairkom.eu - more open source web apps at fairapps.net