bigbluebutton-Github/bigbluebutton-config
Felipe Cecagno 210cd92e50 Merge remote-tracking branch 'bigbluebutton/v0.9.0-release' into mconf-live0.7.1
Conflicts:
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
	bigbluebutton-config/web/index.html
2015-07-27 16:58:55 -03:00
..
bin Merge branch 'bbb-conf-api-mate' into mconf-live0.6.3 2015-05-26 21:55:41 -03:00
cron.daily Use cron job to delete archived files for recordings without marks 2015-03-11 13:40:56 -04: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 Bumped from 0.9.0 to 0.9.1 to fix #1953 2015-06-24 10:58:11 -04:00
bigbluebutton-release Bumped from 0.9.0 to 0.9.1 to fix #1953 2015-06-24 10:58:11 -04:00
check-localization-keys.txt remove and add strings for the localization file 2013-05-27 17:56:48 -05:00