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
..
fonts	Redesign the landing page, mount public timeline on it (#4122)	2017-07-11 15:27:59 +02:00
glitch	Fix onboarding modal & add re-open button (#129)	2017-08-08 21:42:29 +02:00
images	Merge git://github.com/tootsuite/mastodon into tootsuite-master	2017-07-25 21:36:22 +02:00
mastodon	Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4	2017-09-09 23:56:21 -05:00
packs	Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4	2017-09-09 23:56:21 -05:00
styles	Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4	2017-09-09 23:56:21 -05:00