BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5e99ec98c1
bigbluebutton-Github/bigbluebutton-html5/app/server
History
Anton Georgiev 5e99ec98c1 Merge branch 'master' into lock-settings 
Conflicts:
	bigbluebutton-html5/app/client/views/chat/chat_bar.html
	bigbluebutton-html5/app/server/user_permissions.coffee
2015-04-22 14:50:30 +00:00
..
collection_methods Merge branch 'master' into lock-settings 2015-04-22 14:50:30 +00:00
bbblogger.coffee move the HTML5 client code outside of labs 2015-03-05 17:55:23 +00:00
publish.coffee move the HTML5 client code outside of labs 2015-03-05 17:55:23 +00:00
redispubsub.coffee Merge branch 'master' into lock-settings 2015-04-22 14:50:30 +00:00
server.coffee move the HTML5 client code outside of labs 2015-03-05 17:55:23 +00:00
user_permissions.coffee Merge branch 'master' into lock-settings 2015-04-22 14:50:30 +00:00