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.

David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 ... Conflicts: app/javascript/mastodon/features/getting_started/index.js app/javascript/packs/public.js app/javascript/styles/components.scss		7 years ago
..
fonts	…
_mixins.scss	…
about.scss	…
accounts.scss	…
admin.scss	Scrollable tables in settings pages (#4857)	7 years ago
application.scss	…
basics.scss	Add script to make embedded iframes autosize (#4853)	7 years ago
boost.scss	…
common.scss	…
compact_header.scss	…
components.scss	Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4	7 years ago
containers.scss	…
custom.scss	…
footer.scss	…
forms.scss	Adjust settings pages (#4765)	7 years ago
landing_strip.scss	…
lists.scss	…
reset.scss	…
rtl.scss	…
stream_entries.scss	Merge tag 'v1.6.0rc3' into sync/upstream	7 years ago
tables.scss	Scrollable tables in settings pages (#4857)	7 years ago
variables-glitch.scss	…
variables.scss	…