Merge branch 'fix/tracking-majic' into 'develop'
authorfeld <feld@feld.me>
Sat, 12 Dec 2020 19:20:34 +0000 (19:20 +0000)
committerfeld <feld@feld.me>
Sat, 12 Dec 2020 19:20:34 +0000 (19:20 +0000)
commit1e3eb9e0044b0a1d02f63f897cf2fdf0e90ef1ea
tree140880475f8c67a3314bb4fe9e856d74ec84edbd
parentf2bf2131b4721eb579d248bfc4913a80801efcb7
parent7d78c000493506f76f50641f52c9c651d99838c9
Merge branch 'fix/tracking-majic' into 'develop'

Majic: specify commit so source users do not get surprise updates

See merge request pleroma/pleroma!3200