Merge branch 'patch-2' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 16 Aug 2018 15:45:12 +0000 (15:45 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 16 Aug 2018 15:45:12 +0000 (15:45 +0000)
commit8c3880f18cb8bb8d8108082436b2ccff28589f51
tree7abc13f441d1ea56ae621340779c70bc0a809360
parent183ccd18127c657e957f40de43ca309434b2180b
parent05738e7643141776ee59ee156cf18af9d54899f9
Merge branch 'patch-2' into 'develop'

Update mix.exs

See merge request pleroma/pleroma!241