]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f4928d0 11b5fc0)
Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Sat, 21 May 2011 10:21:01 +0000 (11:21 +0100)
committerTom Hughes <tom@compton.nu>
Sat, 21 May 2011 10:21:01 +0000 (11:21 +0100)
Conflicts:
config/environment.rb


Trivial merge
The OpenStreetMap web site