aboutsummaryrefslogtreecommitdiff
path: root/rel
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-09-23 11:49:19 +0000
committerlain <lain@soykaf.club>2020-09-23 11:49:19 +0000
commit436d1a3c41fc92183efffb81cc041ca270025d02 (patch)
treea5a8cbe6911ef067c3d38a360897b390f6a855ff /rel
parentdf1eb5cf7ee6d718a28fca3d3715f11ab0e263cb (diff)
parenta5e1c400e49e7979e70f2c9dd4887ae144dca44c (diff)
downloadpleroma-436d1a3c41fc92183efffb81cc041ca270025d02.tar.gz
Merge branch 'develop' into 'issue/2115'
# Conflicts: # CHANGELOG.md
Diffstat (limited to 'rel')
0 files changed, 0 insertions, 0 deletions