1
0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-02-16 23:53:52 -05:00
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
..
2018-09-29 19:03:33 +02:00
2018-08-29 21:13:49 +02:00