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 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js		6 years ago
..
_mixins.scss	…
about.scss	…
accessibility.scss	…
accounts.scss	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
admin.scss	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
basics.scss	Redesign forms, verify link ownership with rel="me" (#8703)	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	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
dashboard.scss	…
emoji_picker.scss	…
footer.scss	…
forms.scss	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
lists.scss	…
modal.scss	…
reset.scss	…
rtl.scss	…
stream_entries.scss	…
tables.scss	…
variables.scss	…
widgets.scss	…