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
..
2017-11-20 22:13:37 -08:00
2018-01-15 21:23:26 -08:00
2018-01-15 21:17:03 -08:00