]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/5121'
authorTom Hughes <tom@compton.nu>
Wed, 16 Apr 2025 17:14:47 +0000 (18:14 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 16 Apr 2025 17:14:47 +0000 (18:14 +0100)
1  2 
app/views/diary_entries/_diary_entry.html.erb
config/locales/en.yml

Simple merge