v1.1.0

Kegbot · Sep 19, 2014 · c9a3378 · c9a3378
1 parent 562a4c9
commit c9a3378
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -5,21 +5,25 @@ Changelog
 
 **Upgrade Procedure:** Please follow :ref:`upgrading-kegbot` for general upgrade steps.
 
-Current Version (in development)
---------------------------------
-* Fullscreen mode is now exposed on the home page.
-* New beverage fields: IBU, SRM, star rating, and color.
+Version 1.1.0 (2014-09-19)
+--------------------------
+* Fullscreen mode.
+* New keg artwork.
+* New internal beverage fields: IBU, SRM, star rating, and color.
+
 
 Version 1.0.2 (2014-08-21)
 --------------------------
 * Bugfix: Issue #309 (cannot reset password on private sites).
 * Redis logging backend is configurable; see :ref:`settings` (thanks Jared).
 * Bugfix: Issue #313 (``link/`` matching on usernames).
 
+
 Version 1.0.1 (2014-07-21)
 --------------------------
 * Bugfix: Issue #302 (api ``status/`` endpoint).
 
+
 Version 1.0.0 (2014-06-24)
 --------------------------
 * Initial 1.0 release.

diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 from setuptools import setup, find_packages
 
-VERSION = '1.1.0b3'
+VERSION = '1.1.0'
 DOCLINES = __doc__.split('\n')
 
 SHORT_DESCRIPTION = DOCLINES[0]