Merge remote-tracking branch 'osmlab/id-editor-embed'
authorTom Hughes <tom@compton.nu>
Tue, 7 May 2013 13:43:45 +0000 (14:43 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 7 May 2013 13:43:45 +0000 (14:43 +0100)
1  2 
app/assets/stylesheets/common.css.scss
config/locales/en.yml

Simple merge