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
..
core	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-3	2015-11-30 21:44:04 +00:00
matterhorn	After checking we bumped projects version and Flex locales to 0.9.0 with some fixes	2014-08-13 12:20:10 +01:00
presentation	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-3	2015-11-30 21:44:04 +00:00
slides	Delete the 'slides' processing scripts	2014-11-13 11:15:43 -02:00
changelog.md	a log file by meeting in archive phase	2013-04-29 16:03:21 -05:00
deploy.sh	Merge branch '090-new-videodock' into HEAD	2015-01-28 20:33:28 -02:00