Ivan Tashkinov efbc2edba1 [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ...

# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub_controller.ex
#	lib/pleroma/web/router.ex

2019-09-15 18:52:27 +03:00

..

password_controller.ex

[#184] small refactoring reset password

2019-06-24 19:01:56 +00:00

util_controller.ex

[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

2019-09-15 18:52:27 +03:00