From d7a5bd921f96117515b2f83f2d7963da50609129 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Tue, 15 Aug 2017 10:46:27 +0200
Subject: [PATCH] Recent updates

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c173ea..fa3c165 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Modified card padding so it fits more content
 - Fixed ability to select a checkbox in the add/edit bookmark form
 - Made the 404 page theme aware, falls back to default (green) theme
+- Fixed admin pages not working anymore due to `settings` object name clash
+- On Add/Edit bookmark and encountering a 301, show a better message about automatically changing the URL with the provided button
 
 
 ## [1.1.0] - 2017-07-22