merge upstream/master and resolve conflicts from https://github.com/openstreetmap...
authorMikel Maron <mikel_maron@yahoo.com>
Wed, 12 Oct 2016 14:52:05 +0000 (10:52 -0400)
committerMikel Maron <mikel_maron@yahoo.com>
Wed, 12 Oct 2016 14:52:05 +0000 (10:52 -0400)
commitbe40536440b8677323bcf30bc2b869e36f907dd9
tree778ce4b2f2dd67455604b56687ef27a242c133e5
parent3a14abde1beae0438d043f536b8417ea92dc2eb7
parentab0f79bbab109083dfb257cd77294a261a8b9e1b
merge upstream/master and resolve conflicts from https://github.com/openstreetmap/openstreetmap-website/pull/1318
app/controllers/diary_entry_controller.rb
config/locales/en.yml
test/controllers/diary_entry_controller_test.rb