Merge remote-tracking branch 'openstreetmap/pull/1004'
authorTom Hughes <tom@compton.nu>
Mon, 15 Aug 2016 19:20:37 +0000 (20:20 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 15 Aug 2016 19:20:37 +0000 (20:20 +0100)
commitdae3dcf87edcfc0648cd0b93b069b0eee67d3ab7
treec64c6f68843d166e6e2544fa974f6c1b70bd840f
parentc2ece47a58e5141f8e423896117f565aeb90b9f7
parent38981d75499d9b12e5979623f20ba2b7e0daedee
Merge remote-tracking branch 'openstreetmap/pull/1004'
config/key.yml
config/locales/en.yml