Merge branch 'master' into moderation
authorAndy Allan <git@gravitystorm.co.uk>
Wed, 28 Feb 2018 07:55:28 +0000 (15:55 +0800)
committerAndy Allan <git@gravitystorm.co.uk>
Wed, 28 Feb 2018 07:55:28 +0000 (15:55 +0800)
commita20e28809f5ca1e3f3579faeaf118fff3ecc4994
tree7bfad8dcea31352e086143e32dec3ffa6331390a
parent424b6ef1cf760c4a3e27ac1e6f612ae42a9cd493
parent4e138f6bf3677f220e2d2d76ec1bd9004c272ab4
Merge branch 'master' into moderation
Gemfile
Gemfile.lock
app/assets/stylesheets/common.scss
app/models/user.rb
config/locales/en.yml
config/routes.rb