Merge remote-tracking branch 'openstreetmap/pull/1401'
authorTom Hughes <tom@compton.nu>
Sun, 5 Feb 2017 13:50:07 +0000 (13:50 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 5 Feb 2017 13:50:07 +0000 (13:50 +0000)
1  2 
config/locales/en.yml
test/test_helper.rb

Simple merge
Simple merge