1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-15 07:09:03 +09:00
YuruToot/app
Claire 45e56db8e4 Merge commit 'f89512fbedb547f66a72eefdff047768fb505eb6' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept our version.
2024-03-05 16:25:50 +01:00
..
chewy Clamp dates when serializing to Elasticsearch API (#28081) 2023-11-27 13:25:54 +00:00
controllers Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream 2024-02-29 18:24:47 +01:00
helpers Merge commit 'f89512fbedb547f66a72eefdff047768fb505eb6' into glitch-soc/merge-upstream 2024-03-05 16:25:50 +01:00
javascript New Crowdin translations 2024-03-04 04:57:12 +00:00
lib Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream 2024-02-29 18:24:47 +01:00
mailers New welcome email (#28883) 2024-03-01 12:16:53 +00:00
models Merge commit 'f89512fbedb547f66a72eefdff047768fb505eb6' into glitch-soc/merge-upstream 2024-03-05 16:25:50 +01:00
policies Merge commit '3205a654caf903002c2db872f802a3332201678b' 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 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream 2024-02-24 14:27:43 +01:00
services Merge commit '9d8dfeb5fbbc274482489a3ac9f22dd736da156c' into glitch-soc/merge-upstream 2024-02-24 15:35:56 +01:00
validators Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream 2024-01-24 20:42:53 +01:00
views Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream 2024-03-01 18:34:48 +01:00
workers Fix auto-close email being sent to users with devops permissions instead of settings permissions (#29355) 2024-02-22 20:45:40 +01:00