Merge remote-tracking branch 'osmlab/welcome-2'
authorTom Hughes <tom@compton.nu>
Sun, 18 Aug 2013 13:50:36 +0000 (14:50 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 18 Aug 2013 13:50:36 +0000 (14:50 +0100)
commit56fd5c4d90c7d3757fb97ff16c40aaa307ae1d22
tree11d0c26b17f001eb1f934a5e3aaab8ccfe63b8b1
parent4995714644f422d67ae98f43f54fe20738ee4c95
parent618b09a8ab6aa12b86e9702185740a9be6260e18
Merge remote-tracking branch 'osmlab/welcome-2'
config/locales/en.yml
test/functional/user_controller_test.rb