Pedro Beschorner Marin b89a31bb9a Merge remote-tracking branch 'playback-speedup' into mconf ... Conflicts: record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js record-and-playback/presentation/scripts/process/presentation.rb record-and-playback/presentation/scripts/publish/presentation.rb record-and-playback/presentation_export/playback/presentation_export/lib/writing.js		2017-01-26 18:10:20 +00:00
..
process	Merge remote-tracking branch 'playback-speedup' into mconf	2017-01-26 18:10:20 +00:00
publish	Merge remote-tracking branch 'playback-speedup' into mconf	2017-01-26 18:10:20 +00:00
presentation.nginx	Add a note to the nginx config to tell 0.9.0 beta users of a possible upgrade path	2014-10-06 17:30:32 -04:00
presentation.yml	- modify scripts so we can run it manually	2014-04-03 20:23:49 +00:00