Mastodon

History

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

account_moderation_note_policy.rb

…

account_policy.rb

2018-04-02 13:45:07 +02:00

application_policy.rb

2018-02-21 23:21:32 +01:00

backup_policy.rb

2018-02-21 23:21:32 +01:00

custom_emoji_policy.rb

…

domain_block_policy.rb

…

email_domain_block_policy.rb

…

instance_policy.rb

…

invite_policy.rb

2018-08-19 00:58:53 +02:00

relay_policy.rb

2018-07-13 02:16:06 +02:00

report_note_policy.rb

2018-04-02 22:04:14 +02:00

report_policy.rb

…

settings_policy.rb

…

status_policy.rb

2018-10-22 17:51:38 +02:00

subscription_policy.rb

…

tag_policy.rb

2018-12-06 17:36:11 +01:00

user_policy.rb

2018-08-23 23:26:29 +02:00