aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-01-09 17:05:58 -0800
committerzotlabs <mike@macgirvin.com>2018-01-09 17:05:58 -0800
commitd0d72c7fd2a7c96840fa95b8a18d66eff1fb139e (patch)
tree2e899e55f938bcf96fe089ccb6ae7532dcc84a1b
parent3ce79dd6e12c6eb7602649c93798883a2bef1e86 (diff)
parentef7225b4f68ce032184e73b4af7444c90d1109a5 (diff)
downloadvolse-hubzilla-d0d72c7fd2a7c96840fa95b8a18d66eff1fb139e.tar.gz
volse-hubzilla-d0d72c7fd2a7c96840fa95b8a18d66eff1fb139e.tar.bz2
volse-hubzilla-d0d72c7fd2a7c96840fa95b8a18d66eff1fb139e.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
-rw-r--r--CHANGELOG2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d84b8fe4a..6e540a04d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Hubzilla 3.0 (????-??-??)
+Hubzilla 3.0 (2018-01-09)
- Updated homeinstall script
- Sort cloud directory by 1. is_dir and 2. name
- Document that imagick calls/execs ffmpeg for mp4 video thumbnails