Merge branch 'classic-flakeids' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 25 Jan 2019 04:59:06 +0000 (04:59 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 25 Jan 2019 04:59:06 +0000 (04:59 +0000)
commit4df71cd88b2725f1838c2899b3078a74dbb0c33f
tree33da1ceebc81b01a0afabc324c37fefd1352711d
parent9bf1a4234da5125d27c21fb2d4212377348ec123
parenta3ba72d97849ba12a5ea4008bd0b97e80bdd588b
Merge branch 'classic-flakeids' into 'develop'

Flake Ids for Users and Activities

Closes #450

See merge request pleroma/pleroma!645
lib/pleroma/activity.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex