Merge branch 'update/instance-gen-template' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Tue, 22 Dec 2020 11:31:06 +0000 (11:31 +0000)
committerrinpatch <rinpatch@sdf.org>
Tue, 22 Dec 2020 11:31:06 +0000 (11:31 +0000)
commit0ca13be499a5ac5b9940a6b9c931be13cb75a91e
tree6009c58f0b7b014306825091877ea27ab351f069
parent8e1f32e71560c4b36ccbdc3ecf8de8386928305a
parentd5746e84472890ceb3fbc57a8b773fd311038602
Merge branch 'update/instance-gen-template' into 'develop'

Update instance.gen template

See merge request pleroma/pleroma!3210