Thibaut Girka 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes.		2019-08-29 12:07:50 +02:00
..
_mixins.scss	Fix sass-lint config (#10982)	2019-06-06 18:51:46 +02:00
about.scss	Change full logo to use primary text color of the given theme (#10994)	2019-06-08 15:30:06 +02:00
accessibility.scss
accounts.scss	Change preferences page into appearance, notifications, and other (#10977)	2019-06-07 03:39:24 +02:00
admin.scss	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-23 10:51:07 +02:00
basics.scss	Fix edit media modal on small screens, touch events (#11573)	2019-08-15 20:28:56 +02:00
boost.scss
compact_header.scss
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-29 12:07:50 +02:00
containers.scss	Add ActivityPub actor representing the entire server (#11321)	2019-07-19 01:44:42 +02:00
dashboard.scss
emoji_picker.scss	Fix sass-lint config (#10982)	2019-06-06 18:51:46 +02:00
footer.scss	Use <use /> to render transparent SVG logo instead of inserting it (#10845)	2019-05-27 03:33:39 +02:00
forms.scss	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00
introduction.scss
lists.scss
modal.scss
polls.scss	Fix sass-lint config (#10982)	2019-06-06 18:51:46 +02:00
reset.scss
rtl.scss	Fix RTL layout not being RTL within the columns area (#10990)	2019-06-07 23:35:26 +02:00
statuses.scss	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
tables.scss	Add public blocks to /about/blocks (#11298)	2019-08-19 11:35:48 +02:00
variables.scss
widgets.scss	Add trends to public pages sidebar (#11594)	2019-08-18 14:55:32 +02:00