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 e5a603206d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/accounts_controller.rb app/javascript/mastodon/locales/pl.json app/views/about/more.html.haml Conflicts in `accounts_controller.rb` resolved by taking upstream's version + our `use_pack`. Conflicts in `pl.json` resolved by taking upstream's changes. Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.		6 years ago
..
_mixins.scss	…
about.scss	Adjust responsive design for /about/more and /terms (#8158)	6 years ago
accessibility.scss	…
accounts.scss	Redesign public profiles and toots (#8068)	6 years ago
admin.scss	Add federation relay support (#7998)	6 years ago
basics.scss	Compensate for scrollbar disappearing when media modal visible (#8100)	6 years ago
boost.scss	…
compact_header.scss	…
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
containers.scss	Adjust responsive design for /about/more and /terms (#8158)	6 years ago
dashboard.scss	Add admin dashboard (#8029)	6 years ago
emoji_picker.scss	…
footer.scss	Redesign public profiles and toots (#8068)	6 years ago
forms.scss	Fix gradient, regression from #7927 (#7963)	6 years ago
lists.scss	…
modal.scss	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
reset.scss	…
rtl.scss	Fix gradient, regression from #7927 (#7963)	6 years ago
stream_entries.scss	Redesign public profiles and toots (#8068)	6 years ago
tables.scss	…
variables.scss	Redesign public profiles and toots (#8068)	6 years ago
widgets.scss	Adjust responsive design for /about/more and /terms (#8158)	6 years ago