Merge remote-tracking branch 'openstreetmap/pull/1331'
authorTom Hughes <tom@compton.nu>
Wed, 19 Oct 2016 10:52:17 +0000 (11:52 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 19 Oct 2016 10:52:17 +0000 (11:52 +0100)
commit4627b79885a53043001383679e83fafacf5c6193
tree1dadfe3fefd2ec4984543372ae09ed9f1e96094a
parentd058f3ef28d498b117c8d32c54d5e61778259bca
parentfeb3b03227dae5e41e631b1df90afc879355617d
Merge remote-tracking branch 'openstreetmap/pull/1331'
test/controllers/user_controller_test.rb