Thibaut Girka 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb		2019-06-07 17:00:36 +02:00
..
_mixins.scss	Fix sass-lint config (#10982)	2019-06-06 18:51:46 +02:00
about.scss	Reduce padding around logo on landing page (#10291)	2019-03-19 23:47:10 +01:00
accessibility.scss	…
accounts.scss	Fix profile picture preview (#10931)	2019-06-02 18:04:41 +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-07 17:00:36 +02:00
containers.scss	Fix sass-lint config (#10982)	2019-06-06 18:51:46 +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	Fix sass-lint config (#10982)	2019-06-06 18:51:46 +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	Fix Firefox scrollbar color regression in #9210 (#9908)	2019-01-24 13:32:23 +01:00
rtl.scss	Fix sass-lint config (#10982)	2019-06-06 18:51:46 +02:00
stream_entries.scss	Use `<use />` to render transparent SVG logo instead of inserting it (#10845)	2019-05-27 03:33:39 +02:00
tables.scss	Fix relationship manager on narrow screens (#10293)	2019-03-17 22:36:54 +01:00
variables.scss	…
widgets.scss	Make sure the instance banner is never cropped (#10702)	2019-05-05 01:07:15 +02:00