Thibaut Girka 6f75a9001f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/stream_entries/_simple_status.html.haml - config/locales/nl.yml Deleted unused translation strings (themes) and adapted minor changes to _simple_status.html.haml		2018-08-31 19:10:57 +02:00
..
_mixins.scss	…
about.scss	…
accessibility.scss	…
accounts.scss	…
admin.scss	…
basics.scss	…
boost.scss	…
compact_header.scss	…
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-31 19:10:57 +02:00
containers.scss	…
dashboard.scss	…
emoji_picker.scss	…
footer.scss	…
forms.scss	…
lists.scss	…
modal.scss	…
reset.scss	…
rtl.scss	…
stream_entries.scss	…
tables.scss	…
variables.scss	…
widgets.scss	…