Merge branch 'cycles-router-mediaproxy' into 'develop'
authorfeld <feld@feld.me>
Fri, 28 May 2021 18:22:27 +0000 (18:22 +0000)
committerfeld <feld@feld.me>
Fri, 28 May 2021 18:22:27 +0000 (18:22 +0000)
commit9f386df83ccc3bd2d5fc660150e8c3ad432e41f3
tree4dea1c03a66df86f03c86a14044da5d55e92d670
parenta01093c505221d4a2ae2e0713680285348f4faf5
parentbf2ee12fdb4e7d95e1cbf040a4406901b60ddfa2
Merge branch 'cycles-router-mediaproxy' into 'develop'

Recompilation speedup: don't make MediaProxy be a compile-dep of Router

See merge request pleroma/pleroma!3418