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.		2020-03-08 19:38:53 +01:00
..
aliases
applications	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
deletes
exports	Use different strings on exports page (#12569)	2019-12-19 12:47:55 +01:00
featured_tags
flavours
identity_proofs
imports
migration/redirects
migrations
preferences	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-08 19:38:53 +01:00
profiles	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-08 19:38:53 +01:00
shared
two_factor_authentication
two_factor_authentications