Pedro Beschorner Marin abebee010f Merge branch 'daronco/responsive-playback' into mconf ... Conflicts: record-and-playback/presentation/playback/presentation/0.9.0/logo.png record-and-playback/presentation/playback/presentation/0.9.0/playback.html		2016-07-12 16:26:47 +00:00
..
presentation	Merge branch 'daronco/responsive-playback' into mconf	2016-07-12 16:26:47 +00:00