projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9bf1a42
a3ba72d
)
Merge branch 'classic-flakeids' into 'develop'
author
kaniini
<nenolod@gmail.com>
Fri, 25 Jan 2019 04:59:06 +0000
(
04:59
+0000)
committer
kaniini
<nenolod@gmail.com>
Fri, 25 Jan 2019 04:59:06 +0000
(
04:59
+0000)
Flake Ids for Users and Activities
Closes #450
See merge request pleroma/pleroma!645
1
2
lib/pleroma/activity.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/activity_pub/transmogrifier.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/twitter_api/twitter_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/activity.ex
Simple merge
diff --cc
lib/pleroma/web/activity_pub/transmogrifier.ex
Simple merge
diff --cc
lib/pleroma/web/twitter_api/twitter_api_controller.ex
Simple merge
projects / akkoma / commitdiff