Claire 175446f293 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Conflict due to glitch-soc adding the `content_type` column on status edits and thus having a different schema version number. Solved by taking upstream's schema version number, as it is higher than glitch-soc's.		2022-02-17 10:58:44 +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
admin.js	[Glitch] Add graphs and retention metrics to admin dashboard (#16829)	2021-10-14 21:45:01 +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 'main' into glitch-soc/merge-upstream	2022-02-17 10:58:44 +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