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)
1  2 
config/locales/en.yml
test/functional/user_controller_test.rb

Simple merge