Felipe Cecagno a7e286ae33 Merge branch '090-mconf-branding' into mconf-live0.6.2		2015-01-25 12:00:59 -02:00
..
core	Merge branch '090-encrypted-recording' into HEAD	2015-01-21 15:51:29 -02: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.2	2015-01-21 18:11:56 -02:00
mconf_encrypted/scripts	a few tweaks to fit the new rap worker	2014-09-10 17:23:17 -03:00
presentation	Merge branch '090-mconf-branding' into HEAD	2015-01-25 11:59:45 -02:00
presentation_export	Merge branch '090-presentation-export' into mconf-live0.6.2	2015-01-23 14:50:06 -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