]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c1371a 8c82be0)
Merge remote-tracking branch 'upstream/master' into vagrant
authorMatt Amos <zerebubuth@gmail.com>
Sat, 8 Mar 2014 10:18:24 +0000 (10:18 +0000)
committerMatt Amos <zerebubuth@gmail.com>
Sat, 8 Mar 2014 10:18:24 +0000 (10:18 +0000)

Trivial merge
The OpenStreetMap web site