Merge branch 'master' into moderation
authorAndy Allan <git@gravitystorm.co.uk>
Wed, 28 Feb 2018 07:46:25 +0000 (15:46 +0800)
committerAndy Allan <git@gravitystorm.co.uk>
Wed, 28 Feb 2018 07:46:25 +0000 (15:46 +0800)
commit424b6ef1cf760c4a3e27ac1e6f612ae42a9cd493
treefe2e7b6f9332362af07c9c659c0879067e41fdb7
parent7821bf48ad301c4d4253ed0ae7f6d53e2176b6bc
parentff962a1e1b168dc52278a1a7fe9eb21aad3f727e
Merge branch 'master' into moderation
.rubocop_todo.yml
Gemfile
Gemfile.lock
app/assets/stylesheets/common.scss
app/models/user.rb
config/locales/en.yml
test/test_helper.rb