diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f0424f..98be996 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## [1.2.4](https://github.com/pia-lab/pialab-back/tree/1.2.4) (2018-07-17)
+[Full Changelog](https://github.com/pia-lab/pialab-back/compare/1.2.3...1.2.4)
+
+**Merged pull requests:**
+
+- \[Bug Fix\] Fix wrong and notation in twig template [\#32](https://github.com/pia-lab/pialab-back/pull/32) ([PapsOu](https://github.com/PapsOu))
+
 ## [1.2.3](https://github.com/pia-lab/pialab-back/tree/1.2.3) (2018-07-12)
 [Full Changelog](https://github.com/pia-lab/pialab-back/compare/1.2.2...1.2.3)
 
diff --git a/composer.json b/composer.json
index 8deefb3..9913e45 100644
--- a/composer.json
+++ b/composer.json
@@ -89,5 +89,5 @@
             "allow-contrib": false
         }
     },
-    "version": "1.2.3"
+    "version": "1.2.4"
 }