Merge branch 'redesign'
authorTom Hughes <tom@compton.nu>
Thu, 28 Nov 2013 17:30:53 +0000 (17:30 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 28 Nov 2013 17:30:53 +0000 (17:30 +0000)
commit68a3df4d53c84508bf443058040379c3a18eb1a7
tree154f7d5b8a0d8391251e1b2e20b57e1a535b60d4
parentedfd358289c38927e1e14f62d66087e50da6200f
parentfb9b4edcdd95884759fc5013ac2bf86b26ea0bce
Merge branch 'redesign'

Conflicts:
app/assets/stylesheets/common.css.scss
app/views/site/_id.html.erb
config/locales/el.yml
config/locales/et.yml
config/locales/he.yml
config/locales/nl.yml
config/locales/pt-BR.yml