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		2017-09-09 23:56:21 -05:00
..
frontends	…
about.js	…
admin.js	…
application.js	Multiple frontend support (#110)	2017-07-30 19:28:21 +02:00
common.js	…
custom.js	…
public.js	Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4	2017-09-09 23:56:21 -05:00
share.js	…