From 0050c64278e395e80d1a67788f02b3c7d6630b7e Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 16 Dec 2020 14:39:30 +0100
Subject: [PATCH] changelog updated

---
 CHANGELOG                      | 6 ++++++
 smash/web/templates/_base.html | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 53ac3d24..1a60f84f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+smasch (1.0.0~beta.1-1) unstable; urgency=low
+
+  * bug fix: python dependencies are not in conflict
+
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Tue, 15 Dec 2020 11:00:00 +0200
+
 smasch (1.0.0~beta.0-1) unstable; urgency=low
 
   * backward incompatible: all ncer/pdp related fields are moved to custom
diff --git a/smash/web/templates/_base.html b/smash/web/templates/_base.html
index 406c4511..84d7f5c2 100644
--- a/smash/web/templates/_base.html
+++ b/smash/web/templates/_base.html
@@ -256,7 +256,7 @@ desired effect
         {% block footer %}
             <!-- To the right -->
             <div class="pull-right hidden-xs">
-                Version: <strong>1.0.0~beta.0</strong>
+                Version: <strong>1.0.0~beta.1</strong>
             </div>
 
             <!-- Default to the left -->
-- 
GitLab