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

Multiple frontend support (#110)

2017-07-30 19:28:21 +02:00

about.js

Require any modules after loading polyfill in entry points (#4231)

2017-07-18 00:19:02 +02:00

admin.js

Improve admin page (#4121)

2017-07-18 16:38:22 +02:00

application.js

Multiple frontend support (#110)

2017-07-30 19:28:21 +02:00

common.js

Multiple frontend support (#110)

2017-07-30 19:28:21 +02:00

custom.js

adding cybre changes

2017-06-23 21:45:14 +00:00

public.js

Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4

2017-09-09 23:56:21 -05:00

share.js

Add protocol handler. Handle follow intents (#4511)

2017-08-14 04:53:31 +02:00