projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d70d1c4
033771d
)
Merge branch 'develop' into 'develop'
author
lambda
<pleromagit@rogerbraun.net>
Thu, 5 Apr 2018 10:54:07 +0000
(10:54 +0000)
committer
lambda
<pleromagit@rogerbraun.net>
Thu, 5 Apr 2018 10:54:07 +0000
(10:54 +0000)
Fix failure to serve media from custom upload path
See merge request pleroma/pleroma!95
Trivial merge