Thibaut Girka 3fefb7909b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/shared.js`: Upstream has changed how Tesseract.js gets included and dropped a dependency. The conflict is caused by glitch-soc having different code due to its theming system. Ported upstream changes. - `lib/mastodon/version.rb`: Upstream refactor/code style change in a place we replaced upstream's repo URL with ours. Ported upstram changes, keeping our repo URL. - `yarn.lock`: Upstream dropped dependencies, one of which was textually too close to a glitch-soc-specific dependency. Not a real conflict.		2020-09-01 17:02:18 +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	2020-09-01 17:02:18 +02:00
containers.scss
dashboard.scss
emoji_picker.scss
footer.scss
forms.scss
introduction.scss
lists.scss
modal.scss
polls.scss
reset.scss
rtl.scss
statuses.scss
tables.scss
variables.scss
widgets.scss