Merge branch 'card-handling' into 'develop'
authorkaniini <nenolod@gmail.com>
Sat, 23 Feb 2019 03:59:23 +0000 (03:59 +0000)
committerkaniini <nenolod@gmail.com>
Sat, 23 Feb 2019 03:59:23 +0000 (03:59 +0000)
commit101c20f8d95299767c19498d627ff404f0a7b130
treea6681dc1ce495d83fca0f9956b3d60be63e54842
parentab2d2dfa7bc01ce1714d03c32419f357ea6384a2
parent9e0686efa61940fe78736c3e2669acb7233d8ada
Merge branch 'card-handling' into 'develop'

Private card handling

Closes #652

See merge request pleroma/pleroma!854