Merge branch 'fix/elixir-1-8-type-annotation' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Tue, 15 Jan 2019 08:51:59 +0000 (08:51 +0000)
committerlambda <pleromagit@rogerbraun.net>
Tue, 15 Jan 2019 08:51:59 +0000 (08:51 +0000)
Fix Elixir 1.8 type annotation issue

Closes #523

See merge request pleroma/pleroma!668

1  2 
lib/pleroma/upload.ex

Simple merge