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

Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places.

2020-01-20 18:31:11 +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

2020-01-20 18:31:11 +01:00

share.js

Upgrade webpack to version v4.x (#6655)

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