projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e99bab8
8e0e206
)
Merge branch 'feature/reverse-proxy' into 'develop'
author
kaniini
<nenolod@gmail.com>
Fri, 30 Nov 2018 18:15:44 +0000
(18:15 +0000)
committer
kaniini
<nenolod@gmail.com>
Fri, 30 Nov 2018 18:15:44 +0000
(18:15 +0000)
reverse proxy / uploads
See merge request pleroma/pleroma!470
1
2
lib/pleroma/application.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/application.ex
Simple merge