]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: c016bf6)
Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Mon, 4 Oct 2010 23:23:04 +0000 (00:23 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 4 Oct 2010 23:23:04 +0000 (00:23 +0100)
Conflicts:
app/controllers/user_controller.rb


No differences found
The OpenStreetMap web site