summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2021-12-18 15:04:55 +0000
committerlain <lain@soykaf.club>2021-12-18 15:04:55 +0000
commitb686d68cdbe8465148aae4dfc21ec1ec151d04ab (patch)
tree00c94800d436deab6a281f5c555f6bea2098bd9c /test
parent8cfd527589517176add18bb130e3d7d5875e74e3 (diff)
parentff17884c3b78fbae60e32bbad5503d93129ed76a (diff)
downloadpleroma-b686d68cdbe8465148aae4dfc21ec1ec151d04ab.tar.gz
pleroma-b686d68cdbe8465148aae4dfc21ec1ec151d04ab.zip
Merge branch 'from/develop/tusooa/alpine-3.14' into 'develop'
Bump alpine to 3.14 See merge request pleroma/pleroma!3569
Diffstat (limited to 'test')
0 files changed, 0 insertions, 0 deletions