You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/javascript/packs
Thibaut Girka 369a475a70 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/serializers/rest/instance_serializer.rb
- app/views/layouts/error.html.haml
- public/oops.png
  Took our version (same as upstream but without the things that only
  make sense in an animation).

Additional changes:
- app/javascript/flavours/vanilla/theme.yml
  Include upstream's javascript in error pages.
6 years ago
..
about.js Upgrade webpack to version v4.x (#6655) 7 years ago
application.js Upgrade webpack to version v4.x (#6655) 7 years ago
common.js Upgrade webpack to version v4.x (#6655) 7 years ago
error.js Change error graphic to hover-to-play (#10055) 6 years ago
public.js Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
share.js Upgrade webpack to version v4.x (#6655) 7 years ago