]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5df061f 9778714)
Merge branch 'master' into feature/add-communities-page
authorAdam Hoyle <atomoil@gmail.com>
Thu, 12 Aug 2021 18:41:12 +0000 (19:41 +0100)
committerAdam Hoyle <atomoil@gmail.com>
Thu, 12 Aug 2021 18:41:12 +0000 (19:41 +0100)
1  2 
app/views/layouts/_header.html.erb patch | diff1 | diff2 | blob | history
config/locales/en.yml patch | diff1 | diff2 | blob | history

diff --cc app/views/layouts/_header.html.erb
Simple merge
diff --cc config/locales/en.yml
Simple merge
The OpenStreetMap web site