mastodon/public
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 Do not autoplay videos, display play button instead. Use expiring links when using S3. Do not keep originals 2016-12-04 12:28:10 +01:00
emoji cybre cleanup 2017-06-23 21:45:14 +00:00
headers/original Change missing.png header to 1x1 transparent PNG 2017-01-22 06:42:42 +11:00
sounds Add boop sounds in Vorbis format (#2963) 2017-05-10 16:58:54 +02:00
500.html cybre cleanup 2017-06-23 21:45:14 +00:00
android-chrome-192x192.png New logo (#4306) 2017-07-23 02:40:39 +02:00
apple-touch-icon.png New logo (#4306) 2017-07-23 02:40:39 +02:00
background-cybre.png All cybrespace changes through 5/28 2017-06-23 21:45:14 +00:00
badge.png New logo (#4306) 2017-07-23 02:40:39 +02:00
browserconfig.xml New logo (#4306) 2017-07-23 02:40:39 +02:00
clock.js cybrespace to 1.4.2 2017-06-23 21:45:14 +00:00
embed.js Add script to make embedded iframes autosize (#4853) 2017-09-09 16:23:44 +02:00
favicon-dev.ico Use the "m" version of the logo for favicons (#4345) 2017-07-24 19:54:59 +02:00
favicon.ico Use the "m" version of the logo for favicons (#4345) 2017-07-24 19:54:59 +02:00
logo-cybre-glitch.gif All cybrespace changes through 5/28 2017-06-23 21:45:14 +00:00
mask-icon.svg New logo (#4306) 2017-07-23 02:40:39 +02:00
mstile-150x150.png New logo (#4306) 2017-07-23 02:40:39 +02:00
oops.png Adding optional S3, fail-mastodon 2016-11-06 18:35:46 +01:00
riot-glitch.png cybrespace to 1.4.2 2017-06-23 21:45:14 +00:00
robots.txt
sw.js fix #4356 : place sw.js to assets/sw.js (#4357) 2017-07-28 01:55:52 +02:00
web-push-icon_expand.png Use consistent icons for web push notifications, same as web UI (#4426) 2017-07-28 18:13:42 +02:00
web-push-icon_favourite.png Use consistent icons for web push notifications, same as web UI (#4426) 2017-07-28 18:13:42 +02:00
web-push-icon_reblog.png Use consistent icons for web push notifications, same as web UI (#4426) 2017-07-28 18:13:42 +02:00