Skip to content
Snippets Groups Projects
Commit bdfa3a6f authored by Alexander Strizhakov's avatar Alexander Strizhakov
Browse files

Merging with develop

Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
parents 97b35e00 77690b9d
No related branches found
No related tags found
No related merge requests found
Showing with 1675 additions and 73 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment