aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-08-15 03:55:17 -0700
committerzotlabs <mike@macgirvin.com>2017-08-15 03:55:17 -0700
commit8000d6b5d4de2e11de2413990dc5c0e1a7f9c1e5 (patch)
tree6f12de365398d5b4ecc178cd4ae92e57325548aa /CHANGELOG
parente9679d251cea59c3948bcaa9c651f47338783384 (diff)
parent4b0d0df781b06cd892faba75a0d891f59d50e186 (diff)
downloadvolse-hubzilla-8000d6b5d4de2e11de2413990dc5c0e1a7f9c1e5.tar.gz
volse-hubzilla-8000d6b5d4de2e11de2413990dc5c0e1a7f9c1e5.tar.bz2
volse-hubzilla-8000d6b5d4de2e11de2413990dc5c0e1a7f9c1e5.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG3
1 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index eeb02d483..7fe022e08 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
Hubzilla 2.6 (2017-??-??)
+ - Upgrade to bootstrap-4 beta
- Consolidate disable_discover_tab config
- Fix some bbcode to markdown conversion issues
- Improved finding of recursive attachment permissions
@@ -60,7 +61,7 @@ Hubzilla 2.6 (2017-??-??)
- Deprecate server_role
- Introduce automatic language selection for help, webpages, and wiki content
- Provide ability to order apps in app-tray
- - Replace Mardownify library with html-to-markdown library
+ - Replace Markdownify library with html-to-markdown library
Bugfixes
- Fix channel manager and nav channel select visible if in a delegate session