]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: dd7ef37)
Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Mon, 6 Sep 2010 11:49:10 +0000 (12:49 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 6 Sep 2010 11:49:10 +0000 (12:49 +0100)
Conflicts:
app/controllers/user_controller.rb
app/views/user/terms.html.erb
config/locales/en.yml


No differences found
The OpenStreetMap web site