Merge branch 'master' into moderation
authorAndy Allan <git@gravitystorm.co.uk>
Wed, 2 Aug 2017 11:12:57 +0000 (12:12 +0100)
committerAndy Allan <git@gravitystorm.co.uk>
Wed, 2 Aug 2017 11:12:57 +0000 (12:12 +0100)
commite31376e28da8f656e33508cc899da465b63673c5
tree4136f0b1c570aebdf14ee22638054326e98210ee
parentc1cdddf11f363d24f7c18b3e9df15e1bde3c4302
parentf258af223bd2b9b682398b072864b68090b37d25
Merge branch 'master' into moderation
Gemfile
Gemfile.lock
app/controllers/diary_entry_controller.rb
app/views/browse/changeset.html.erb
app/views/diary_entry/view.html.erb
app/views/layouts/_header.html.erb
app/views/user/view.html.erb