summaryrefslogtreecommitdiff
path: root/docs/administration
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2020-12-12 19:20:34 +0000
committerfeld <feld@feld.me>2020-12-12 19:20:34 +0000
commit1e3eb9e0044b0a1d02f63f897cf2fdf0e90ef1ea (patch)
tree140880475f8c67a3314bb4fe9e856d74ec84edbd /docs/administration
parentf2bf2131b4721eb579d248bfc4913a80801efcb7 (diff)
parent7d78c000493506f76f50641f52c9c651d99838c9 (diff)
downloadpleroma-1e3eb9e0044b0a1d02f63f897cf2fdf0e90ef1ea.tar.gz
pleroma-1e3eb9e0044b0a1d02f63f897cf2fdf0e90ef1ea.zip
Merge branch 'fix/tracking-majic' into 'develop'
Majic: specify commit so source users do not get surprise updates See merge request pleroma/pleroma!3200
Diffstat (limited to 'docs/administration')
0 files changed, 0 insertions, 0 deletions