projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6a0e69a
ef5033d
)
Merge branch 'bugfix/repeated-follow-unfollow' into 'develop'
author
lambadalambda
<gitgud@rogerbraun.net>
Mon, 17 Apr 2017 09:46:59 +0000
(
05:46
-0400)
committer
lambadalambda
<gitgud@rogerbraun.net>
Mon, 17 Apr 2017 09:46:59 +0000
(
05:46
-0400)
Add error messages for repeated follows and unfollows
See merge request !7
1
2
lib/pleroma/user.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/twitter_api/twitter_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/twitter_api/twitter_api_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/user.ex
Simple merge
diff --cc
lib/pleroma/web/twitter_api/twitter_api_controller.ex
Simple merge
diff --cc
test/web/twitter_api/twitter_api_test.exs
Simple merge