Merge branch 'fix/oom-parallel-rendering' into 'develop'
authorlain <lain@soykaf.club>
Wed, 11 Sep 2019 11:21:03 +0000 (11:21 +0000)
committerlain <lain@soykaf.club>
Wed, 11 Sep 2019 11:21:03 +0000 (11:21 +0000)
commitfb7332aec7e5db781ffddf01e1510ffbfc9eac11
tree1b2cf9cf50d5cbb67495b4e768d24d7edf3a1c1d
parent69800055f1c78c4d45d52ceb111fb717f62a2599
parent5a76d5d2391f0fa6b4c58bf190b0cdbfff96014f
Merge branch 'fix/oom-parallel-rendering' into 'develop'

Revert "Parallelize template rendering"

See merge request pleroma/pleroma!1654