diff options
author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2024-02-20 10:52:46 +0000 |
---|---|---|
committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2024-02-20 10:52:46 +0000 |
commit | f0468697cd74f4ec062f9c6feda53cfbe9e4500c (patch) | |
tree | 8c19daa6ac627ab8797eb90e96b028f2e182232b /test/support | |
parent | 0b9bc4a0d0e44a873bc59e8994f1996499ed0c4b (diff) | |
parent | e149ee6e225667ca964e30a08179ca84b8537aaf (diff) | |
download | pleroma-f0468697cd74f4ec062f9c6feda53cfbe9e4500c.tar.gz pleroma-f0468697cd74f4ec062f9c6feda53cfbe9e4500c.zip |
Merge branch 'mergeback/2.6.2' into 'develop'
Mergeback: Security Release 2.6.2
Closes #3245
See merge request pleroma/pleroma!4075
Diffstat (limited to 'test/support')
0 files changed, 0 insertions, 0 deletions