mastodon/app/javascript/core
Thibaut Girka b62953b3d2 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
..
admin.js Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
common.js
embed.js
mailer.js
public.js Merge branch 'master' into glitch-soc/merge-upstream 2018-08-18 18:04:49 +02:00
settings.js Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
theme.yml