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.

2019-02-17 12:26:55 +01:00

..

about.js

Upgrade webpack to version v4.x (#6655)

2018-07-14 03:56:41 +02:00

application.js

Upgrade webpack to version v4.x (#6655)

2018-07-14 03:56:41 +02:00

common.js

Upgrade webpack to version v4.x (#6655)

2018-07-14 03:56:41 +02:00

error.js

Change error graphic to hover-to-play (#10055)

2019-02-15 23:33:25 +01:00

public.js

Merge branch 'master' into glitch-soc/merge-upstream

2019-01-19 18:28:37 +01:00

share.js

Upgrade webpack to version v4.x (#6655)

2018-07-14 03:56:41 +02:00