Merge branch 'release/0.0.6' into develop

praekelt · Apr 15, 2013 · 1a9302d · 1a9302d
2 parents f60ded3 + 017e21e
commit 1a9302d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.0.6
+-----
+#. Add `DOWNLOAD_INTERNAL_REDIRECT_HEADER` setting (default 'X-Accel-Redirect') in case a webserver other than Nginx is used.
+#. Add `DOWNLOAD_SERVE_FROM` setting (default 'LOCAL') to specify whether to serve the files locally or redirect to a remote location.
+
 0.0.5
 -----
 #. Fix bug where X-Accel-Redirect uses file name override instead of actual file name to serve download, causing a 404 if the file name and override don't match.

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='jmbo-downloads',
-    version='0.0.5',
+    version='0.0.6',
     description='Downloads for Jmbo.',
     long_description=(open('README.rst', 'r').read() +
                         open('AUTHORS.rst', 'r').read() +