You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).		6 years ago
..
_mixins.scss	Allow joining several hashtags in a single column (#8904)	6 years ago
about.scss	Revert Font Awesome 5 upgrade (#8810)	6 years ago
accessibility.scss	…
accounts.scss	Revert Font Awesome 5 upgrade (#8810)	6 years ago
admin.scss	Revert Font Awesome 5 upgrade (#8810)	6 years ago
basics.scss	…
boost.scss	…
compact_header.scss	…
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
containers.scss	…
dashboard.scss	…
emoji_picker.scss	…
footer.scss	…
forms.scss	check_boxes label should use display: inline-block (#9348)	6 years ago
lists.scss	…
modal.scss	…
reset.scss	fix(reset): Property name for styled scrollbars (#9210)	6 years ago
rtl.scss	RTL: fix toot privacy preferences radio buttonss (#9146)	6 years ago
stream_entries.scss	undo part of PR 8202 to fix RTL (#8979)	6 years ago
tables.scss	Revert Font Awesome 5 upgrade (#8810)	6 years ago
variables.scss	…
widgets.scss	Revert Font Awesome 5 upgrade (#8810)	6 years ago