You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.		5 years ago
..
account_moderation_note_policy.rb	…
account_policy.rb	…
account_warning_preset_policy.rb	…
announcement_policy.rb	…
application_policy.rb	…
backup_policy.rb	…
custom_emoji_policy.rb	…
domain_allow_policy.rb	…
domain_block_policy.rb	…
email_domain_block_policy.rb	…
instance_policy.rb	…
invite_policy.rb	…
poll_policy.rb	…
relay_policy.rb	…
report_note_policy.rb	…
report_policy.rb	…
settings_policy.rb	…
status_policy.rb	…
tag_policy.rb	…
user_policy.rb	…