]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: a37e1b8)
Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Sun, 22 May 2011 17:01:15 +0000 (18:01 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 22 May 2011 17:01:15 +0000 (18:01 +0100)
Conflicts:
app/views/user/login.html.erb


No differences found
The OpenStreetMap web site