Skip to content
Snippets Groups Projects
Commit 101c20f8 authored by kaniini's avatar kaniini
Browse files

Merge branch 'card-handling' into 'develop'

Private card handling

Closes #652

See merge request pleroma/pleroma!854
parents ab2d2dfa 9e0686ef
No related branches found
No related tags found
No related merge requests found
Showing with 195 additions and 72 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