Merge branch 'release/1.3.6' into develop

getnikola · Aug 17, 2015 · 5db9caa · 5db9caa
2 parents d16d086 + ffd2bc8
commit 5db9caa
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 8 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,7 +2,11 @@
 Appendix A. Changelog
 =====================
 
-:Version: 1.3.5
+:Version: 1.3.6
+
+1.3.6
+    * Patch URLs for HTTPS sites
+    * Really add descriptions for icons (got lost between branches)
 
 1.3.5
     * Add icon descriptions for the navigation bar

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -6,7 +6,7 @@ Appendix A. Contribution rules
 :Copyright: © 2015, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
 :Date: 2015-08-17
-:Version: 1.3.5
+:Version: 1.3.6
 
 .. index:: contributing
 

diff --git a/coil/__init__.py b/coil/__init__.py
@@ -29,4 +29,4 @@
 
 __all__ = ['__version__']
 
-__version__ = '1.3.5'
+__version__ = '1.3.6'
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
@@ -2,7 +2,11 @@
 Appendix A. Changelog
 =====================
 
-:Version: 1.3.5
+:Version: 1.3.6
+
+1.3.6
+    * Patch URLs for HTTPS sites
+    * Really add descriptions for icons (got lost between branches)
 
 1.3.5
     * Add icon descriptions for the navigation bar

diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst
@@ -6,7 +6,7 @@ Appendix A. Contribution rules
 :Copyright: © 2015, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
 :Date: 2015-08-17
-:Version: 1.3.5
+:Version: 1.3.6
 
 .. index:: contributing
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.3.5'
+version = '1.3.6'
 # The full version, including alpha/beta/rc tags.
-release = '1.3.5'
+release = '1.3.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
     dependencies = [l.strip() for l in fh]
 
 setup(name='coil',
-      version='1.3.5',
+      version='1.3.6',
       description='A user-friendly CMS frontend for Nikola.',
       keywords='coil,nikola,cms',
       author='Chris Warrick, Roberto Alsina, Henry Hirsch et al.',