Merge branch 'bring-ecto-back-to-mainline' into 'develop'
authorlambda <lain@soykaf.club>
Wed, 22 May 2019 10:05:05 +0000 (10:05 +0000)
committerlambda <lain@soykaf.club>
Wed, 22 May 2019 10:05:05 +0000 (10:05 +0000)
commitad535ae55b045c93054ab95ae89a70b767ef8bdd
tree68daaf0d9e79702b8894994a843e8c12ae2dac2b
parentff363f70b54ef1f310bf3bd7e506e13ca174675b
parentf4cfcead8868481c19ebd93b0fcd2b942dc0e477
Merge branch 'bring-ecto-back-to-mainline' into 'develop'

Mix: Bring ecto-sql back to mainline.

See merge request pleroma/pleroma!1192