summaryrefslogtreecommitdiff
path: root/docs/configuration
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-10-04 18:23:33 +0000
committerkaniini <ariadne@dereferenced.org>2019-10-04 18:23:33 +0000
commit4d38e4855820786bfa1dc7fc58d7ff78728e3ab6 (patch)
tree5f15dc593422ec056ecba97fed24672277bb504b /docs/configuration
parentca6f1644aa72e9f3b56e57b8b6dfc0830d44648a (diff)
parent3a923be434c1ca1e2eccded633a7a7330c0e74d9 (diff)
downloadpleroma-4d38e4855820786bfa1dc7fc58d7ff78728e3ab6.tar.gz
pleroma-4d38e4855820786bfa1dc7fc58d7ff78728e3ab6.zip
Merge branch 'chore/1.1-changelog-fixup' into 'maint/1.1'
Sync 1.1.0 changelog with develop See merge request pleroma/pleroma!1787
Diffstat (limited to 'docs/configuration')
0 files changed, 0 insertions, 0 deletions