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

Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml		2019-07-19 18:26:49 +02:00
..
contrast	Fix sass-lint config (#10982)	2019-06-06 18:51:46 +02:00
fonts	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-22 20:40:04 +02:00
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
mastodon-light	Fix more issues in the light theme (#10996)	2019-06-08 22:32:59 +02:00
application.scss	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
contrast.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
mailer.scss	Fix sass-lint config (#10982)	2019-06-06 18:51:46 +02:00
mastodon-light.scss	More polished light theme (#7620)	2018-05-25 18:36:26 +02:00
win95.scss	Fix syntax errors in win95 SCSS file	2019-01-02 15:36:59 +01:00