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
..
frontends	Multiple frontend support (#110)	7 years ago
about.js	Require any modules after loading polyfill in entry points (#4231)	7 years ago
admin.js	Improve admin page (#4121)	7 years ago
application.js	Multiple frontend support (#110)	7 years ago
common.js	Multiple frontend support (#110)	7 years ago
custom.js	adding cybre changes	7 years ago
public.js	Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4	7 years ago
share.js	Add protocol handler. Handle follow intents (#4511)	7 years ago