Merge branch 'master' into routing
authorTom Hughes <tom@compton.nu>
Sun, 1 Feb 2015 11:32:02 +0000 (11:32 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 1 Feb 2015 11:32:02 +0000 (11:32 +0000)
commit13d650e2dcbe2467a82253097e10d58dddf9d9d2
tree8b663448533ee990185203b1aadd42b8e5f3ade0
parentfcae6999d0df503fec0e1dfdc16eb2f273e382ea
parent959a076b50b5bce5e5d0360c80b59cbe62e3955f
Merge branch 'master' into routing
app/assets/stylesheets/common.scss
app/assets/stylesheets/small.scss
config/locales/en.yml