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		2018-09-19 21:46:01 +02:00
..
_mixins.scss	…
about.scss	…
accessibility.scss	Add a few black emojis that are to have a white outline (#8597)	2018-09-10 18:26:47 +02:00
accounts.scss	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
admin.scss	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
basics.scss	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
boost.scss	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
compact_header.scss	…
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
containers.scss	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
dashboard.scss	…
emoji_picker.scss	…
footer.scss	…
forms.scss	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
lists.scss	…
modal.scss	…
reset.scss	feat(css): Styled scrollbars in Firefox Nightly (#8653)	2018-09-09 02:08:49 +02:00
rtl.scss	…
stream_entries.scss	Make unfollow button light up red when hovered (#8286)	2018-08-19 03:28:43 +02:00
tables.scss	…
variables.scss	…
widgets.scss	…