]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 4462983)
Merge branch 'master' into redesign
authorJohn Firebaugh <john.firebaugh@gmail.com>
Tue, 19 Nov 2013 17:42:47 +0000 (09:42 -0800)
committerJohn Firebaugh <john.firebaugh@gmail.com>
Tue, 19 Nov 2013 17:42:47 +0000 (09:42 -0800)
Conflicts:
vendor/assets/leaflet/leaflet.hash.js
vendor/assets/leaflet/leaflet.js


No differences found
The OpenStreetMap web site