]> granicus.if.org Git - ejabberd/commit
Merge remote-tracking branch 'processone/pr/899'
authorHolger Weiss <holger@zedat.fu-berlin.de>
Mon, 11 Jan 2016 11:38:51 +0000 (12:38 +0100)
committerHolger Weiss <holger@zedat.fu-berlin.de>
Mon, 11 Jan 2016 11:38:51 +0000 (12:38 +0100)
commit3e1425b9058456dc2433ad3c14e503c684012bbe
tree29a300dea7a39be955872cf66d18c0736336736d
parent65e6dfb9ddadacc147fe460cfd9bd499a83db429
parent0ad0fd2187b9d9eb144c772fee6f1bc7a7382a00
Merge remote-tracking branch 'processone/pr/899'

* processone/pr/899:
  mod_http_upload: Use application/octet-stream instead of text/html for security reasons