This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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
..
core	…
flavours	[Glitch] Fix `/web` redirecting to `/web/web` in web UI	2020-02-25 14:30:43 +01:00
fonts	…
images	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-24 14:37:06 +01:00
locales	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-08 19:38:53 +01:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-06 21:36:38 +01:00
skins	…
styles	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-08 19:38:53 +01:00