Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb		2019-05-04 16:37:26 +02:00
..
_mixins.scss	…
about.scss	…
accessibility.scss	…
accounts.scss	Add "why do you want to join" field to invite requests (#10524)	2019-04-09 23:06:30 +09:00
admin.scss	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:02:54 +01:00
basics.scss	…
boost.scss	…
compact_header.scss	…
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-04 16:37:26 +02:00
containers.scss	squashed identity proof updates (#10375)	2019-03-28 18:01:09 +01:00
dashboard.scss	…
emoji_picker.scss	Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413)	2019-03-30 01:41:35 +01:00
footer.scss	…
forms.scss	Provide a link to existing domain block when trying to block an already-blocked domain (#10663)	2019-05-03 20:36:36 +02:00
introduction.scss	…
lists.scss	…
modal.scss	…
polls.scss	…
reset.scss	…
rtl.scss	…
stream_entries.scss	Improve blocked view of profiles (#10491)	2019-04-07 04:59:13 +02:00
tables.scss	…
variables.scss	…
widgets.scss	Add "why do you want to join" field to invite requests (#10524)	2019-04-09 23:06:30 +09:00