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 0fd3f87ea2 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
..
core	Merge branch 'master' into glitch-soc/master	5 years ago
flavours	[Glitch] Fix `/web` redirecting to `/web/web` in web UI	5 years ago
fonts	Theme: Windows 95	7 years ago
images	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
packs	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
skins	Port Sylvhem's mastodon-light to glitch flavour	7 years ago
styles	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago