summaryrefslogtreecommitdiff
path: root/docs/configuration
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-10-05 19:46:23 +0000
committerkaniini <ariadne@dereferenced.org>2019-10-05 19:46:23 +0000
commit294e08cb65940ff193d6920e576f56718a5623f4 (patch)
tree5113a78b25db1d3258d7e0c752946243b7563583 /docs/configuration
parent4168ead67290fce809c8c7bf671fd9de07079da6 (diff)
parent565809592cf2618291cb59adf31aea7ed0ee78bb (diff)
downloadpleroma-294e08cb65940ff193d6920e576f56718a5623f4.tar.gz
pleroma-294e08cb65940ff193d6920e576f56718a5623f4.zip
Merge branch 'backport/update-activity-fixes' into 'maint/1.1'
backport update activity fixes to maint/1.1 See merge request pleroma/pleroma!1797
Diffstat (limited to 'docs/configuration')
0 files changed, 0 insertions, 0 deletions