projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 15513f0 c19e539)
Merge branch 'backport/hex-flake-id' into 'maint/1.1'
authorkaniini <ariadne@dereferenced.org>
Fri, 4 Oct 2019 22:11:34 +0000 (22:11 +0000)
committerkaniini <ariadne@dereferenced.org>
Fri, 4 Oct 2019 22:11:34 +0000 (22:11 +0000)
backport: hex `flake_id` support

See merge request pleroma/pleroma!1793

1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history
lib/pleroma/application.ex patch | diff1 | diff2 | blob | history

diff --cc CHANGELOG.md
Simple merge
diff --cc lib/pleroma/application.ex
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git