]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: bbf30e7)
merge 19889:20181 of rails_port into the openID branch
authorKai Krueger <kakrueger@gmail.com>
Sat, 27 Feb 2010 11:21:15 +0000 (11:21 +0000)
committerKai Krueger <kakrueger@gmail.com>
Sat, 27 Feb 2010 11:21:15 +0000 (11:21 +0000)
merge conflicts with the remember_me functionality


No differences found
The OpenStreetMap web site