Merge branch 'master' into production

This commit is contained in:
Nick Winter 2014-11-28 19:49:38 -08:00
commit 1d51100130

View file

@ -3,7 +3,7 @@ extends /templates/base
block outer_content block outer_content
#spacer #spacer
a#play-button(href="/play", data-i18n="common.play") a#play-button(href="/play", data-i18n="home.play")
//#or-ipad(data-i18n="home.or_ipad") //#or-ipad(data-i18n="home.or_ipad")