projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5b6070e
aef7e94
)
Merge branch 'develop' into dtluna/pleroma-bugfix/deny-empty-posts
author
Roger Braun
<roger@rogerbraun.net>
Tue, 25 Apr 2017 09:09:14 +0000
(11:09 +0200)
committer
Roger Braun
<roger@rogerbraun.net>
Tue, 25 Apr 2017 09:09:14 +0000
(11:09 +0200)
1
2
lib/pleroma/web/twitter_api/twitter_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/twitter_api/twitter_api_controller.ex
Simple merge