Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.

2018-12-09 16:08:04 +01:00

..

show.html.haml

Merge branch 'master' into glitch-soc/merge-upstream

2018-12-09 16:08:04 +01:00