]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 832b96b)
Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Sat, 21 May 2011 11:14:56 +0000 (12:14 +0100)
committerTom Hughes <tom@compton.nu>
Sat, 21 May 2011 11:14:56 +0000 (12:14 +0100)
Conflicts:
app/controllers/user_controller.rb
app/views/user/terms.html.erb
test/fixtures/users.yml


No differences found
The OpenStreetMap web site