Anton Georgiev 7bf1d4ce8c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-3 ... Conflicts: record-and-playback/core/scripts/bigbluebutton.yml		2015-11-30 21:44:04 +00:00
..
process	temp changes	2015-10-13 19:00:50 +00:00
publish	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-3	2015-11-30 21:44:04 +00:00
presentation.nginx	Add a note to the nginx config to tell 0.9.0 beta users of a possible upgrade path	2014-10-06 17:30:32 -04:00
presentation.yml	- modify scripts so we can run it manually	2014-04-03 20:23:49 +00:00