Richard Alam 401ac84e49 Merge branch 'master' into merge-polling-with-master ... Conflicts: bigbluebutton-config/bin/bbb-conf		2014-03-19 13:59:03 +00:00
..
bin	Merge branch 'master' into merge-polling-with-master	2014-03-19 13:59:03 +00:00
cron.daily	Edited cron.daily to ensure it removes older presentation directories in /var/bigbluebutton	2013-05-05 14:42:55 -07: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	updated release to 0.9.0-dev	2014-03-13 01:19:25 +00:00
bigbluebutton-release	updated release to 0.9.0-dev	2014-03-13 01:19:25 +00:00
check-localization-keys.txt	remove and add strings for the localization file	2013-05-27 17:56:48 -05:00