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
..
avatars/original	…
emoji	cybre cleanup	2017-06-23 21:45:14 +00:00
headers/original	…
sounds	…
500.html	…
android-chrome-192x192.png	…
apple-touch-icon.png	New logo (#4306)	2017-07-23 02:40:39 +02:00
background-cybre.png	…
badge.png	…
browserconfig.xml	…
clock.js	…
embed.js	…
favicon-dev.ico	…
favicon.ico	…
logo-cybre-glitch.gif	…
mask-icon.svg	…
mstile-150x150.png	…
oops.png	…
riot-glitch.png	cybrespace to 1.4.2	2017-06-23 21:45:14 +00:00
robots.txt	Initial commit	2016-02-20 22:53:20 +01:00
sw.js	…
web-push-icon_expand.png	…
web-push-icon_favourite.png	…
web-push-icon_reblog.png	…