summaryrefslogtreecommitdiff
path: root/priv
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2024-05-07 23:21:37 +0000
committerfeld <feld@feld.me>2024-05-07 23:21:37 +0000
commitb42963a52c32fb9b6cafc0863f962a8dfb952050 (patch)
treee3d67aff783e198ab51e3408e8c32458e4774d71 /priv
parentffa6805c0919abca6de2329ce01966d883876b30 (diff)
parent750fb25f48d1d90157100acee5d2ee019d0bd9be (diff)
downloadpleroma-b42963a52c32fb9b6cafc0863f962a8dfb952050.tar.gz
pleroma-b42963a52c32fb9b6cafc0863f962a8dfb952050.zip
Merge branch 'revert-50af909c' into 'develop'
Revert "Merge branch 'pleroma-card-image-description' into 'develop'" See merge request pleroma/pleroma!4107
Diffstat (limited to 'priv')
0 files changed, 0 insertions, 0 deletions