aboutsummaryrefslogtreecommitdiff
path: root/docs/configuration/cheatsheet.md
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-04-14 16:31:41 +0000
committerlain <lain@soykaf.club>2020-04-14 16:31:41 +0000
commit3677a1e5785e8a753652debf37b2818e622f9ffd (patch)
treee4c307c37a7a12052b6b34d4fce6b5f2833012f7 /docs/configuration/cheatsheet.md
parentbf3afbc1a109e5965b335b21d4e7c522ad7a571c (diff)
parent7c060432fcac294269742ac3f452beb3f9a2fdab (diff)
downloadpleroma-3677a1e5785e8a753652debf37b2818e622f9ffd.tar.gz
Merge branch 'revert-13a7105b' into 'develop'
Revert "Merge branch 'marker-update-fix' into 'develop'" See merge request pleroma/pleroma!2383
Diffstat (limited to 'docs/configuration/cheatsheet.md')
0 files changed, 0 insertions, 0 deletions