Thibaut Girka 9101254d0a Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/packs/public.js`:
  Upstream modified code that we split between multiple files due
  to glitch-soc's theming system.
  Ported those changes.

2020-04-05 18:32:06 +02: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

2020-04-05 18:32:06 +02:00

share.js

Upgrade webpack to version v4.x (#6655)

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