Merge branch 'hex-flake-id' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Thu, 26 Sep 2019 02:51:54 +0000 (02:51 +0000)
committerkaniini <ariadne@dereferenced.org>
Thu, 26 Sep 2019 02:51:54 +0000 (02:51 +0000)
Replace `Pleroma.FlakeId` with `flake_id` hex package

See merge request pleroma/pleroma!1692

1  2 
lib/pleroma/application.ex
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/common_api/utils.ex
mix.exs
mix.lock

Simple merge
Simple merge
Simple merge
diff --cc mix.exs
Simple merge
diff --cc mix.lock
Simple merge