projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5673597
ba9ef77
)
Merge branch 'phoenix14' into 'develop'
author
lambda
<pleromagit@rogerbraun.net>
Mon, 17 Dec 2018 19:30:05 +0000
(19:30 +0000)
committer
lambda
<pleromagit@rogerbraun.net>
Mon, 17 Dec 2018 19:30:05 +0000
(19:30 +0000)
Upgrade to Phoenix 1.4
Closes #451
See merge request pleroma/pleroma!560
1
2
test/web/web_finger/web_finger_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
test/web/web_finger/web_finger_controller_test.exs
Simple merge