Merge branch 'bugfix/locked-account-regression' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Fri, 8 Jun 2018 05:10:08 +0000 (05:10 +0000)
committerlambda <pleromagit@rogerbraun.net>
Fri, 8 Jun 2018 05:10:08 +0000 (05:10 +0000)
commitc86823f724cff550bd4a394035f63218114b5d1d
tree7e9283bfa9c18b4e694011dcb159e31ccddafff7
parent595ca3bb3a80eb3908a96b13c8b446296219a9c7
parent1e9dd6fbc2ecf0c3e7528c40f3145b2a9e591d7a
Merge branch 'bugfix/locked-account-regression' into 'develop'

security fix: locked account regression

See merge request pleroma/pleroma!200