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

..

views

Log admin/moderator actions

2019-08-25 19:39:37 +00:00

admin_api_controller.ex

[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).

2019-09-15 18:22:08 +03:00

config.ex

expanding regex sigils to use modifiers

2019-09-11 09:25:33 +03:00

search.ex

Merge develop

2019-05-08 14:34:36 +00:00