summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md15
1 files changed, 15 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 835e73740..d4fa552ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,20 @@ The format is almost based on [Keep a Changelog](https://keepachangelog.com/en/1
## [16.x.x]
### Changed
+<<<<<<< HEAD
+- Added vue and ng-vue packages (#1421)
+- Added new `news:updater:update-user` command to update the feeds of a single user (#1360).
+### Fixed
+
+# Releases
+## [16.0.1] - 2021-08-02
+### Changed
+- Reimplemented relative time formatting as a filter (#1450)
+
+### Fixed
+- Set icon offset explicitly for navigation items (#1465)
+
+=======
### Fixed
@@ -51,6 +65,7 @@ Note: Nextcloud 20 support will be dropped in Oct 2021, this is very likely the
### Fixed
- Set icon offset explicitly for navigation items (#1465)
+>>>>>>> master
## [16.0.0] - 2021-06-16
There are no additional changes compared to the latest beta.