Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml		2019-04-01 21:28:31 +02:00
..
_mixins.scss
about.scss	Reduce padding around logo on landing page (#10291)	2019-03-19 23:47:10 +01:00
accessibility.scss
accounts.scss
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-03-30 12:36:24 +01: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	squashed identity proof updates (#10375)	2019-03-28 18:01:09 +01:00
introduction.scss
lists.scss
modal.scss
polls.scss	Add muted style for polls in web UI (#10248)	2019-03-12 22:08:18 +01:00
reset.scss
rtl.scss
stream_entries.scss	Hide blocking accounts from blocked users (#10442)	2019-04-01 20:06:13 +02:00
tables.scss	Fix relationship manager on narrow screens (#10293)	2019-03-17 22:36:54 +01:00
variables.scss
widgets.scss	Fix transparent avatars showing underlying elements in avatar stack and profile (#10422)	2019-03-30 01:13:19 +01:00