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 c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb		6 years ago
..
_mixins.scss	…
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	Revert Font Awesome 5 upgrade (#8810)	6 years ago
lists.scss	…
modal.scss	…
reset.scss	…
rtl.scss	RTL: fix margins: public-layout.header.nav-button (#8823)	6 years ago
stream_entries.scss	…
tables.scss	Revert Font Awesome 5 upgrade (#8810)	6 years ago
variables.scss	…
widgets.scss	Revert Font Awesome 5 upgrade (#8810)	6 years ago