You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		7 years ago
..
avatars/original	…
emoji	cybre cleanup	7 years ago
headers/original	…
sounds	…
500.html	cybre cleanup	7 years ago
android-chrome-192x192.png	New logo (#4306)	7 years ago
apple-touch-icon.png	New logo (#4306)	7 years ago
background-cybre.png	All cybrespace changes through 5/28	7 years ago
badge.png	New logo (#4306)	7 years ago
browserconfig.xml	New logo (#4306)	7 years ago
clock.js	cybrespace to 1.4.2	7 years ago
embed.js	Add script to make embedded iframes autosize (#4853)	7 years ago
favicon-dev.ico	Use the "m" version of the logo for favicons (#4345)	7 years ago
favicon.ico	Use the "m" version of the logo for favicons (#4345)	7 years ago
logo-cybre-glitch.gif	All cybrespace changes through 5/28	7 years ago
mask-icon.svg	New logo (#4306)	7 years ago
mstile-150x150.png	New logo (#4306)	7 years ago
oops.png	…
riot-glitch.png	cybrespace to 1.4.2	7 years ago
robots.txt	…
sw.js	fix #4356 : place sw.js to assets/sw.js (#4357)	7 years ago
web-push-icon_expand.png	Use consistent icons for web push notifications, same as web UI (#4426)	7 years ago
web-push-icon_favourite.png	Use consistent icons for web push notifications, same as web UI (#4426)	7 years ago
web-push-icon_reblog.png	Use consistent icons for web push notifications, same as web UI (#4426)	7 years ago