# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2018-04-24 07:21:46
# Node ID a0b8075280c7dd529dfb2f246797a14e42fa7f11
# Parent  caed5435ffcc51d854fc604dd8bc7f85f5124ea2
# Parent  8691983d243310dde5ee750fe3df5f527114c335

release: merge back stable branch into default

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -35,3 +35,4 @@ 6c5ecbf0778ef870e5b23d9fad5340135b563356
 be788a89a939ebd63606220064bd624fa9d5c9c9 v4.11.4
 15c90a04098a373ac761fab07695fd80dde3bcdb v4.11.5
 77aff155b3251cc00394a49f5e8f2c99e33149a7 v4.11.6
+c218a1ce5d370c2e671d42a91684b3fc2c91b81d v4.12.0