Skip to content
Permalink
Browse files

Merge branch 'release/1.3.6' into develop

  • Loading branch information
Kwpolska committed Aug 17, 2015
2 parents d16d086 + ffd2bc8 commit 5db9caa8dc5645d51eaf1a13280c195e7db88d98
Showing with 16 additions and 8 deletions.
  1. +5 −1 CHANGELOG.rst
  2. +1 −1 CONTRIBUTING.rst
  3. +1 −1 coil/__init__.py
  4. +5 −1 docs/CHANGELOG.rst
  5. +1 −1 docs/CONTRIBUTING.rst
  6. +2 −2 docs/conf.py
  7. +1 −1 setup.py
@@ -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
@@ -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

@@ -29,4 +29,4 @@

__all__ = ['__version__']

__version__ = '1.3.5'
__version__ = '1.3.6'
@@ -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
@@ -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

@@ -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.
@@ -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.',

0 comments on commit 5db9caa

Please sign in to comment.
You can’t perform that action at this time.