aboutsummaryrefslogtreecommitdiff
path: root/priv
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-12-23 11:40:34 +0100
committerlain <lain@soykaf.club>2020-12-23 11:40:34 +0100
commit5ada38499b8f906306796b9771361571fdf03073 (patch)
treee3c9386d9e2b338754fcbe85a09af7f624c6c43e /priv
parent322463e1bdc9da76a93918fd9168a0e8fbd46802 (diff)
parent463eec992a43c74682aca192cebff4a293d4a358 (diff)
downloadpleroma-5ada38499b8f906306796b9771361571fdf03073.tar.gz
Merge branch 'release/2.2.1' of git.pleroma.social:pleroma/pleroma into release/2.2.1
Diffstat (limited to 'priv')
0 files changed, 0 insertions, 0 deletions