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
..
bin	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-3	2015-11-30 21:44:04 +00:00
cron.daily	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-3	2015-11-30 21:44:04 +00:00
record	added chrome plugin patch for test recording	2010-11-19 05:04:16 +00:00
slides	moving these configuration files into git	2010-09-18 23:24:04 +00:00
web	Update index.html	2015-10-05 11:44:47 -04:00
bigbluebutton-release	bump from 1.0.0-dev to 1.0.0-beta	2015-09-23 18:00:16 -04:00
check-localization-keys.txt	remove and add strings for the localization file	2013-05-27 17:56:48 -05:00