1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-14 22:59:46 +09:00
YuruToot/app/javascript/mastodon/features/ui
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
..
components Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 2017-09-09 23:56:21 -05:00
containers Do not scroll the columns area due to redirection (#4541) 2017-08-29 14:16:21 +02:00
util Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 2017-09-09 23:56:21 -05:00
index.js Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 2017-09-09 23:56:21 -05:00