Merge branch 'master' into moderation
authorAndy Allan <git@gravitystorm.co.uk>
Wed, 29 Nov 2017 12:18:39 +0000 (12:18 +0000)
committerAndy Allan <git@gravitystorm.co.uk>
Wed, 29 Nov 2017 12:18:39 +0000 (12:18 +0000)
commiteffb1b7f4170bb7244c4dfffcbe6134fe00e2bc4
tree4c3e2d5660f23c293a629e8dc34facdf72ece5d7
parentdd619fbe73fcd19e2dc4f3e8160158b8d90b3a66
parent8f1676b71ae32eca2706b582f65bcefec2285976
Merge branch 'master' into moderation
Gemfile
Gemfile.lock
app/assets/stylesheets/common.scss
app/controllers/diary_entry_controller.rb
app/models/user.rb
config/locales/en-GB.yml
config/locales/en.yml
config/routes.rb
test/test_helper.rb