Attempt to resolve merge conflict
[akkoma] / lib / pleroma / web / oauth / authorization.ex
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-10-18 kaniiniMerge branch 'bugfix/html-scrub-schemes' into 'develop'
2018-10-14 kaniiniMerge branch 'security/clear-oauth-with-password' into...
2018-10-14 Haelwenn (lanodan... Delete Tokens and Authorizations on password change
2018-05-24 lambdaMerge branch 'feature/lists' into 'develop'
2018-05-13 lambdaMerge branch 'feature/unrepeats' into 'develop'
2018-05-13 lainMerge branch 'develop' into kaniini/pleroma-bugfix...
2018-05-13 lambdaMerge branch 'patch-2' into 'develop'
2018-05-13 lambdaMerge branch 'feld-varnish' into 'develop'
2018-05-07 lainMore warning fixes.
2018-05-06 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-10 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-01 KANEKO YoshitakaFix conflict
2018-03-30 lainFormat the code.
2018-03-22 lainMerge branch 'develop' into kaniini/pleroma-feature...
2018-03-22 lainFix test.
2018-03-20 lambdaMerge branch 'feld-varnish' into 'develop'
2018-03-20 lambdaMerge branch 'patch-README' into 'develop'
2018-03-20 lambdaMerge branch 'feld-mastoweb5000' into 'develop'
2018-03-20 lambdaMerge branch 'feld-Logger' into 'develop'
2018-03-19 Mark Feldercap again
2018-03-19 Mark Felderstart with a capital
2017-09-11 lambadalambdaMerge branch 'oauth2' into 'develop'
2017-09-11 Roger BraunMerge branch 'develop' into oauth2
2017-09-09 Roger BraunMake auth tokens usable once and expire them.
2017-09-07 Roger BraunSlight cleanup.
2017-09-06 Roger BraunAdd very basic oauth and mastodon api support.