From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Wed, 26 Apr 2017 19:18:16 +0000 (+0200)
Subject: Merge remote-tracking branch 'processone/pr/1699'
X-Git-Tag: 17.06-beta~109
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b8364b6c8d65e08da48bab66b48ddadfaf85423;p=ejabberd

Merge remote-tracking branch 'processone/pr/1699'

* processone/pr/1699:
  Add support for HTTP File Upload, version 0.3.0
---

9b8364b6c8d65e08da48bab66b48ddadfaf85423