From 3dfa39adb04b5e675e1ebe0c312bbfb3240f6a05 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sat, 15 Aug 2015 22:50:48 +0200
Subject: [PATCH] docs: Add #1248/#1254 to changelog

---
 docs/changelog.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 75fdc538..24bc7682 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,19 @@ Changelog
 
 This changelog is used to track all major changes to Mopidy.
 
+
+v1.1.1 (UNRELEASED)
+===================
+
+Bug fix release.
+
+- Stream: If "file" is present in the :confval:`stream/protocols` config value
+  and the :ref:`ext-file` extension is enabled, we exited with an error because
+  two extensions claimed the same URI scheme. We now log a warning recommending
+  to remove "file" from the :confval:`stream/protocols` config, and then
+  proceed startup. (Fixes: :issue:`1248`, PR: :issue:`1254`)
+
+
 v1.1.0 (2015-08-09)
 ===================