Merge remote-tracking branch 'openstreetmap/pull/1349'
authorTom Hughes <tom@compton.nu>
Sat, 29 Oct 2016 17:08:31 +0000 (18:08 +0100)
committerTom Hughes <tom@compton.nu>
Sat, 29 Oct 2016 17:08:31 +0000 (18:08 +0100)
1  2 
app/views/diary_entry/rss.rss.builder

Simple merge