Merge branch 'develop' into 'develop'
authorlain <lain@soykaf.club>
Fri, 4 Sep 2020 18:19:23 +0000 (18:19 +0000)
committerlain <lain@soykaf.club>
Fri, 4 Sep 2020 18:19:23 +0000 (18:19 +0000)
commit2cd2a8fda3f5a7c2da017eb8e0d786690bdb5509
treec526b4e79b1076ad2c381827f6dbf1c0a37df729
parent2b04cdf407c9ce4134a0fe448b7f8dff7f6ff57f
parent173b04df48abf1b40aa0aa4ba5de50c370687f56
Merge branch 'develop' into 'develop'

Added cmake

See merge request pleroma/pleroma!2953