From c6e028018ae5dcb197b8fabd80ce70b4c7d553d5 Mon Sep 17 00:00:00 2001
From: Jonas Haag <jonas@lophus.org>
Date: Wed, 14 Feb 2018 10:58:54 +0100
Subject: [PATCH] Version 1.2.2
---
CHANGELOG.rst | 5 +++++
klaus/__init__.py | 2 +-
setup.py | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ee1d41e..585a13b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
Changelog
=========
+1.2.2 (Feb 14, 2018)
+-------------------
+- #202: Windows encoding problem (Jonas Haag)
+- #201: Improve diff rendering (Jonas Haag)
+
1.2.1 (Jul 5, 2017)
-------------------
- SECURITY ISSUE, PLEASE UPDATE: Fix #200: Missing HTML escaping in diff view
diff --git a/klaus/__init__.py b/klaus/__init__.py
index 7745125..6a07e40 100644
--- a/klaus/__init__.py
+++ b/klaus/__init__.py
@@ -6,7 +6,7 @@ from klaus import views, utils
from klaus.repo import FancyRepo
-KLAUS_VERSION = utils.guess_git_revision() or '1.2.1'
+KLAUS_VERSION = utils.guess_git_revision() or '1.2.2'
class Klaus(flask.Flask):
diff --git a/setup.py b/setup.py
index e6e1a70..426e351 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ requires = ['six', 'flask', 'pygments', 'dulwich>=0.13.0', 'httpauth', 'humanize
setup(
name='klaus',
- version='1.2.1',
+ version='1.2.2',
author='Jonas Haag',
author_email='jonas@lophus.org',
packages=['klaus', 'klaus.contrib'],
--
GitLab