Thibaut Girka ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, we deleted it to not be flooded by Depandabot. Kept deleted. - `Gemfile.lock`: Puma updated on both sides, went for the most recent version. - `app/controllers/api/v1/mutes_controller.rb`: Upstream updated the serializer to support timed mutes, while glitch-soc added a custom API ages ago to get information that is already available elsewhere. Dropped the glitch-soc-specific API, went with upstream changes. - `app/javascript/core/admin.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/javascript/packs/public.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/models/mute.rb`: 🤷 - `app/models/user.rb`: New user setting added upstream while we have glitch-soc-specific user settings. Added upstream's user setting. - `config/settings.yml`: Upstream added a new user setting close to a user setting we had changed the defaults for. Added the new upstream setting. - `package.json`: Upstream dependency updated “too close” to a glitch-soc-specific dependency. No real conflict. Updated the dependency.		2020-10-21 19:10:50 +02:00
..
contrast	Fix unreadable placeholder text color in high contrast theme in web UI (#14803)	2020-09-15 09:24:24 +02:00
fonts
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-10-21 19:10:50 +02:00
mastodon-light	Add duration parameter to muting. (#13831)	2020-10-13 01:01:14 +02:00
application.scss
contrast.scss
mailer.scss	Add option to include reported statuses in warning e-mail (#11639)	2019-08-23 22:37:23 +02:00
mastodon-light.scss
win95.scss