Merge branch 'improve/instance-gen' into 'develop'
authorfeld <feld@feld.me>
Mon, 12 Oct 2020 17:24:24 +0000 (17:24 +0000)
committerfeld <feld@feld.me>
Mon, 12 Oct 2020 17:24:24 +0000 (17:24 +0000)
commit03855f97893d94777f3dfe71b5e792010429e0c8
tree39426a8ed2c0dd752f36ecc4a0b5e227246b9657
parent68d0380633a14422003a507705143932358b372e
parent6c61ef14c3f48910c52e17c68fce175682717962
Merge branch 'improve/instance-gen' into 'develop'

#2159 Support enabling upload filters during instance gen

See merge request pleroma/pleroma!3070