Felipe Cecagno 6d7c4b5d6e Merge branch '090-encrypted-recording' into mconf-live0.6.3		2015-05-19 00:03:19 -03:00
..
core	Merge branch 'mconf-live0.6.3' into bigbluebutton/bigbluebutton@v0.9.0-release	2015-05-17 19:25:26 -03: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
mconf_decrypter/scripts	Merge branch '090-encrypted-recording' into mconf-live0.6.3	2015-05-19 00:03:19 -03:00
mconf_encrypted/scripts	fixed the start and end time on the encrypted format metadata, which is now based on epoch	2015-03-24 21:15:25 -03:00
presentation	Merge branch 'mconf-live0.6.3' into bigbluebutton/bigbluebutton@v0.9.0-release	2015-05-17 19:25:26 -03:00
presentation_export	updating the mconf logo on presentation_export	2015-02-02 20:50:12 -02: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-presentation-export' into mconf-live0.6.2	2015-01-23 14:50:06 -02:00