Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature...
[akkoma] / lib / pleroma / PasswordResetToken.ex
2018-04-10 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-01 KANEKO YoshitakaFix conflict
2018-03-30 lainFormat the code.
2017-12-09 Roger BraunMerge branch 'develop' into feature/activitypub
2017-11-19 lambdaMerge branch 'feature/fix-warnings' into 'develop'
2017-11-19 ThogFix all compilation warnings
2017-10-19 Roger BraunAdd password reset.