projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d799f4e 1cea6b3)
Rebase to current master
authorhikemaniac <31667811+hikemaniac@users.noreply.github.com>
Fri, 18 May 2018 11:59:59 +0000 (13:59 +0200)
committerGitHub <noreply@github.com>
Fri, 18 May 2018 11:59:59 +0000 (13:59 +0200)
Merge openstreetmap/openstreetmap-website into hikemaniac/openstreetmap-website


Trivial merge
The OpenStreetMap web site