Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.		2020-12-15 14:27:06 +01:00
..
_mixins.scss	…
about.scss	…
accessibility.scss	…
accounts.scss	Fix lock icon not being shown when locking account in profile settings (#14190)	2020-07-01 13:51:50 +02:00
admin.scss	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-26 13:02:14 +02:00
basics.scss	Fix various issues around OpenGraph representation of media (#14133)	2020-06-25 01:33:01 +02:00
boost.scss	Change media modals look in web UI (#15217)	2020-11-27 03:24:11 +01:00
compact_header.scss	…
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
containers.scss	…
dashboard.scss	…
emoji_picker.scss	…
footer.scss	…
forms.scss	Add ability to require invite request text (#15326)	2020-12-14 10:03:09 +01:00
introduction.scss	…
lists.scss	…
modal.scss	…
polls.scss	…
reset.scss	…
rtl.scss	Add a visibility icon to status (#14123)	2020-06-25 22:43:59 +02:00
statuses.scss	Fix avatar size in public page detailed status (#14140)	2020-06-25 22:41:12 +02:00
tables.scss	…
variables.scss	Add interrelationship icon (#15149)	2020-11-12 17:43:12 +01:00
widgets.scss	Add interrelationship icon (#15149)	2020-11-12 17:43:12 +01:00