summaryrefslogtreecommitdiff
path: root/test/support
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2023-12-16 01:03:37 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2023-12-16 01:03:37 +0000
commit147b37b89324055d92f7230a7d504a4a82deaf1e (patch)
tree9b5ced050726629930dafa1e7b414b208b426e0f /test/support
parent7622a83973d9b904c9536413e7c0d026dcc51393 (diff)
parentf5559f3aff1d4ba6c754a8a9ef632507cb5433be (diff)
downloadpleroma-147b37b89324055d92f7230a7d504a4a82deaf1e.tar.gz
pleroma-147b37b89324055d92f7230a7d504a4a82deaf1e.zip
Merge branch 'mergeback/2.6.1' into 'develop'
mergeback: 2.6.1 Closes #3194 See merge request pleroma/pleroma!4003
Diffstat (limited to 'test/support')
0 files changed, 0 insertions, 0 deletions