Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb Upstream added audio attachment support - app/serializers/initial_state_serializer.rb Upstream added audio attachment support and how mimetypes are returned - app/serializers/rest/instance_serializer.rb Upstream added a few fields - config/application.rb Upstream added a different paperclip transcoder		2019-06-24 15:02:59 +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-06-07 17:00:36 +02:00
basics.scss	Fix sass-lint config (#10982)	2019-06-06 18:51:46 +02:00
boost.scss
compact_header.scss
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-24 15:02:59 +02:00
containers.scss	Change full logo to use primary text color of the given theme (#10994)	2019-06-08 15:30:06 +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 preferences page into appearance, notifications, and other (#10977)	2019-06-07 03:39:24 +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
stream_entries.scss	Improve light theme (#10992)	2019-06-08 10:23:41 +02:00
tables.scss
variables.scss
widgets.scss	Make sure the instance banner is never cropped (#10702)	2019-05-05 01:07:15 +02:00