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 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.		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	Add profile directory (#9427)	6 years ago
admin.scss	Revert Font Awesome 5 upgrade (#8810)	6 years ago
basics.scss	Separate font-family into variable (#8763)	6 years ago
boost.scss	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
compact_header.scss	…
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
containers.scss	Separate font-family into variable (#8763)	6 years ago
dashboard.scss	Separate font-family into variable (#8763)	6 years ago
emoji_picker.scss	…
footer.scss	…
forms.scss	Fix padding on select elements in preferences (#9517)	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	Separate font-family into variable (#8763)	6 years ago
widgets.scss	Fix various things in the directory (#9449)	6 years ago