]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 64f373d)
Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Tue, 11 May 2010 20:22:43 +0000 (21:22 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 11 May 2010 20:22:43 +0000 (21:22 +0100)
Conflicts:
app/controllers/user_controller.rb
app/views/user/new.html.erb
config/locales/en.yml
public/stylesheets/common.css


No differences found
The OpenStreetMap web site