Claire 7782e4dc0d Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/about_controller.rb`:
  Minor conflict caused by glitch-soc's theming system.
  Ported upstream changes.

2020-12-10 09:41:49 +01:00

..

about.js

Change how CDN_HOST is passed down to make assets build reproducible (#14381)

2020-10-13 01:19:35 +02:00

application.js

Change how CDN_HOST is passed down to make assets build reproducible (#14381)

2020-10-13 01:19:35 +02:00

common.js

[Glitch] Change how CDN_HOST is passed down to make assets build reproducible

2020-10-21 21:28:47 +02:00

error.js

Change how CDN_HOST is passed down to make assets build reproducible (#14381)

2020-10-13 01:19:35 +02:00

public-path.js

Change how CDN_HOST is passed down to make assets build reproducible (#14381)

2020-10-13 01:19:35 +02:00

public.js

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

2020-12-10 09:41:49 +01:00

share.js

Change how CDN_HOST is passed down to make assets build reproducible (#14381)

2020-10-13 01:19:35 +02:00