2
0
Fork 0
chuckya-fe-standalone/app
Claire 1b06e4e1b7 Merge commit 'c76ae7a5c0' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/public.jsx`:
  In glitch-soc, this file was split across the following files:
  - `app/javascript/packs/public.jsx`
  - `app/javascript/core/embed.js`
  - `app/javascript/core/settings.js`
  Update all those files accordingly, as well as the related `theme.yml` files.
2024-03-15 22:37:55 +01:00
..
chewy Clamp dates when serializing to Elasticsearch API (#28081) 2023-11-27 13:25:54 +00:00
controllers Merge commit '7720c684c5' into glitch-soc/merge-upstream 2024-03-15 12:20:32 +01:00
helpers Merge commit 'a32a126cac' into glitch-soc/merge-upstream 2024-03-13 20:14:18 +01:00
javascript Merge commit 'c76ae7a5c0' into glitch-soc/merge-upstream 2024-03-15 22:37:55 +01:00
lib Merge commit '7720c684c5' into glitch-soc/merge-upstream 2024-03-15 12:20:32 +01:00
mailers New welcome email (#28883) 2024-03-01 12:16:53 +00:00
models Merge commit '7720c684c5' into glitch-soc/merge-upstream 2024-03-15 12:20:32 +01:00
policies Merge commit '3205a654ca' into glitch-soc/merge-upstream 2024-01-26 20:47:20 +01:00
presenters Add annual reports for accounts (#28693) 2024-01-24 09:38:10 +00:00
serializers Merge commit '24319836de' into glitch-soc/merge-upstream 2024-03-11 17:29:07 +01:00
services Merge commit 'b43eaa4517' into glitch-soc/merge-upstream 2024-03-13 20:12:58 +01:00
validators Merge commit '01ce9df880' into glitch-soc/merge-upstream 2024-01-24 20:42:53 +01:00
views Merge commit 'f445d33fd6' into glitch-soc/merge-upstream 2024-03-15 12:43:59 +01:00
workers Merge commit '24319836de' into glitch-soc/merge-upstream 2024-03-11 17:29:07 +01:00