David Yip 201e82686f Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
      app/javascript/styles/mastodon/components.scss

2018-01-17 18:37:09 -06:00

..

actions

Fix home regeneration (#6251)

2018-01-17 23:56:03 +01:00

components

Fix home regeneration (#6251)

2018-01-17 23:56:03 +01:00

containers

…

features

Fix home regeneration (#6251)

2018-01-17 23:56:03 +01:00

locales

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-01-17 18:37:09 -06:00

middleware

Audio.prototype.seek is undefined (#5935)

2017-12-09 01:25:00 +01:00

reducers

Fix home regeneration (#6251)

2018-01-17 23:56:03 +01:00

selectors

…

service_worker

…

store

…

.gitkeep

…

api.js

Refactor /api/web APIs to use the centralized axios instance (#6223)

2018-01-08 20:01:33 +01:00

base_polyfills.js

…

extra_polyfills.js

…

initial_state.js

…

is_mobile.js

…

link_header.js

…

load_polyfills.js

…

main.js

bug fix (WebPush does not work) (#6120)

2017-12-28 16:20:34 +01:00

performance.js

…

ready.js

…

rtl.js

…

scroll.js

…

settings.js

Move push notifications settings (regression from #5879) (#5941)

2017-12-09 14:18:45 +01:00

stream.js

Use streaming API for standalone timelines on /about and /tag pages (#5998)

2017-12-13 02:12:41 +01:00

test_setup.js

…

uuid.js

…