Merge branch 'master' into moderation
authorAndy Allan <git@gravitystorm.co.uk>
Wed, 12 Jul 2017 09:16:11 +0000 (10:16 +0100)
committerAndy Allan <git@gravitystorm.co.uk>
Wed, 12 Jul 2017 09:16:11 +0000 (10:16 +0100)
commitdbd88d893f3c3fce9cafd666b94396988646d81f
tree9cc5a4dc36d0b68d7736dbfbc32fdb4d1d19dd94
parent9046b5ba8d07cd8907685ab8da7f73829cb692c5
parent107e9515b35544cb8e4ac66838b9a37f95cdfa89
Merge branch 'master' into moderation
13 files changed:
Gemfile
Gemfile.lock
app/assets/stylesheets/common.scss
app/controllers/diary_entry_controller.rb
app/models/notifier.rb
app/models/user.rb
app/views/diary_entry/view.html.erb
app/views/layouts/_header.html.erb
app/views/user/view.html.erb
config/locales/en-GB.yml
config/locales/en.yml
config/routes.rb
db/structure.sql