projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7e9f14b
54ccbd8
)
Merge branch 'feature/unrepeats' into 'develop'
author
lambda
<pleromagit@rogerbraun.net>
Sun, 13 May 2018 09:32:29 +0000
(09:32 +0000)
committer
lambda
<pleromagit@rogerbraun.net>
Sun, 13 May 2018 09:32:29 +0000
(09:32 +0000)
Add unrepeats
Closes #69
See merge request pleroma/pleroma!113
1
2
lib/pleroma/web/activity_pub/activity_pub.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/activity_pub/transmogrifier.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/common_api/common_api.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/ostatus/activity_representer.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/router.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/twitter_api/twitter_api.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/twitter_api/twitter_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/activity_pub/activity_pub_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
test/web/mastodon_api/mastodon_api_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc
lib/pleroma/web/activity_pub/transmogrifier.ex
Simple merge
diff --cc
lib/pleroma/web/common_api/common_api.ex
Simple merge
diff --cc
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge
diff --cc
lib/pleroma/web/ostatus/activity_representer.ex
Simple merge
diff --cc
lib/pleroma/web/router.ex
Simple merge
diff --cc
lib/pleroma/web/twitter_api/twitter_api.ex
Simple merge
diff --cc
lib/pleroma/web/twitter_api/twitter_api_controller.ex
Simple merge
diff --cc
test/web/activity_pub/activity_pub_test.exs
Simple merge
diff --cc
test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge