aboutsummaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorrinpatch <rin@patch.cx>2022-01-14 22:15:10 +0000
committerrinpatch <rin@patch.cx>2022-01-14 22:15:10 +0000
commit8b5a658991e6ee3adf22d32c5e56dae5ff6aa0d1 (patch)
treeaf5021db29cb40092834708c6519bed72cea6b83 /ci
parent84dcb55b0f1ef759eb27ee3e6a756c32f035981b (diff)
parenta4436bcc3ffe9dce57ce442d2d6cc521b13efb34 (diff)
downloadpleroma-8b5a658991e6ee3adf22d32c5e56dae5ff6aa0d1.tar.gz
Merge branch 'mergeback' into 'develop'
Merge stable back into develop Closes #2753 See merge request pleroma/pleroma!3602
Diffstat (limited to 'ci')
0 files changed, 0 insertions, 0 deletions