aboutsummaryrefslogtreecommitdiff
path: root/rel
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-08-10 13:59:38 +0000
committerlain <lain@soykaf.club>2020-08-10 13:59:38 +0000
commit93fbf399543fead24f8066d0cba33a0a51b89dd3 (patch)
treec379401de63410564e8cf8e080551c3205c77ce2 /rel
parent353f3466d638efc012cdf5688d66edac20431da8 (diff)
parent5c4548d5e74e40e18d8d1ed98ad256568a063370 (diff)
downloadpleroma-93fbf399543fead24f8066d0cba33a0a51b89dd3.tar.gz
Merge branch 'revert-a6d3bb5f' into 'develop'
Revert "Merge branch 'issue/1023' into 'develop'" Closes #2033 See merge request pleroma/pleroma!2868
Diffstat (limited to 'rel')
0 files changed, 0 insertions, 0 deletions