]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: dc35b59)
Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Mon, 7 Jun 2010 21:24:24 +0000 (22:24 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 7 Jun 2010 21:24:24 +0000 (22:24 +0100)
Conflicts:
config/locales/is.yml


No differences found
The OpenStreetMap web site