projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6c94b74
05ca420
)
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes...
author
Ivan Tashkinov
<ivantashkinov@gmail.com>
Fri, 10 Jan 2020 13:18:32 +0000
(16:18 +0300)
committer
Ivan Tashkinov
<ivantashkinov@gmail.com>
Fri, 10 Jan 2020 13:18:32 +0000
(16:18 +0300)
# Conflicts:
# lib/pleroma/user.ex
1
2
config/config.exs
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/user.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/oauth/oauth_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
test/web/pleroma_api/controllers/emoji_api_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
config/config.exs
Simple merge
diff --cc
lib/pleroma/user.ex
Simple merge
diff --cc
test/web/oauth/oauth_controller_test.exs
Simple merge
diff --cc
test/web/pleroma_api/controllers/emoji_api_controller_test.exs
Simple merge
projects / akkoma / commitdiff