Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Sat, 8 Sep 2018 09:20:34 +0000 (09:20 +0000)
committerlambda <pleromagit@rogerbraun.net>
Sat, 8 Sep 2018 09:20:34 +0000 (09:20 +0000)
auth overhaul and legacy GS auth

See merge request pleroma/pleroma!331

1  2 
lib/pleroma/web/router.ex

Simple merge