diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-07-18 00:17:17 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-07-18 00:17:17 +0200 |
| commit | 731e1dcd438ee7b1cc8555c2c9546035a7e45dc5 (patch) | |
| tree | 896cc791e69d84ef31c4c5ae784cb4fdc06c3936 /CHANGELOG.md | |
| parent | ee3d15765df6162b7c0b5f295eaabc3e868a116a (diff) | |
| parent | 451345f8ed050cf446f848368807a99981d8ab44 (diff) | |
Merge branch 'development'
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8489e9db..2fe23833 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ ###Changelog ####Version 1.5.0 -* upload files to HTTP host and share them in MUCs. requiers new [HttpUploadComponent](https://github.com/siacs/HttpUploadComponent) on server side +* upload files to HTTP host and share them in MUCs. requires new [HttpUploadComponent](https://github.com/siacs/HttpUploadComponent) on server side ####Version 1.4.5 * fixes to message parser to not display some ejabberd muc status messages |