aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-07-10 15:21:27 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-07-10 15:21:27 +0200
commitee3d15765df6162b7c0b5f295eaabc3e868a116a (patch)
tree09ff227e989a0b99a557d7fac9660bc79e445e8d
parentb73901c3aedf4c9f5f6b77b5354b97701ba91e49 (diff)
parent81af16fb6cf71ac5a3e6732cb937e182b9134e2f (diff)
Merge branch 'development'
-rw-r--r--CHANGELOG.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1170e5a2..8489e9db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
###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
+
####Version 1.4.5
* fixes to message parser to not display some ejabberd muc status messages