Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.		2018-12-09 16:08:04 +01:00
..
_mixins.scss	Allow joining several hashtags in a single column (#8904)	2018-11-05 18:53:25 +01:00
about.scss	Revert Font Awesome 5 upgrade (#8810)	2018-09-28 02:11:14 +02:00
accessibility.scss	…
accounts.scss	Add profile directory (#9427)	2018-12-06 17:36:11 +01:00
admin.scss	Revert Font Awesome 5 upgrade (#8810)	2018-09-28 02:11:14 +02:00
basics.scss	…
boost.scss	…
compact_header.scss	…
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
containers.scss	…
dashboard.scss	…
emoji_picker.scss	…
footer.scss	…
forms.scss	check_boxes label should use display: inline-block (#9348)	2018-11-25 16:26:15 +01:00
lists.scss	…
modal.scss	…
reset.scss	fix(reset): Property name for styled scrollbars (#9210)	2018-11-05 18:51:26 +01:00
rtl.scss	RTL: fix toot privacy preferences radio buttonss (#9146)	2018-10-30 00:49:29 +01:00
stream_entries.scss	undo part of PR 8202 to fix RTL (#8979)	2018-10-15 04:39:20 +02:00
tables.scss	Revert Font Awesome 5 upgrade (#8810)	2018-09-28 02:11:14 +02:00
variables.scss	…
widgets.scss	Fix various things in the directory (#9449)	2018-12-07 16:37:32 +01:00