From 27f605032ab6538259919149bfd2342cfbc35824 Mon Sep 17 00:00:00 2001
From: Simon Schaufelberger <simonschaufi@googlemail.com>
Date: Tue, 23 Aug 2016 01:00:50 +0200
Subject: [PATCH] :sparkles: 1.1.0 Release

---
 .github/ISSUE_TEMPLATE | 2 +-
 build.xml              | 2 +-
 composer.json          | 2 +-
 includes/version.php   | 2 +-
 kimai.json             | 6 +++---
 updater/updater.php    | 5 +++--
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE
index 168874061..53ce4b34b 100644
--- a/.github/ISSUE_TEMPLATE
+++ b/.github/ISSUE_TEMPLATE
@@ -6,6 +6,6 @@
 
 #### Reproducable on demo.kimai.org? [yes|no]
 
-#### Kimai version [for example: dev 1.0.1.1388|github master|github develop]
+#### Kimai version [for example: dev 1.1.0.1389|github master|github develop]
 
 #### Relevant log entries from Debug tab
diff --git a/build.xml b/build.xml
index 23d9a53dc..4d4fca70f 100644
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,7 @@
 <project name="Kimai" default="help">
 
 	<!-- values depending on the Kimai version and your development environment -->
-	<property name="release.version" value="1.0.1"/>
+	<property name="release.version" value="1.1.0"/>
 	<property name="release.directory" location="/tmp/kimai/"/>
 
 	<!-- default target just dumps a copyright notice -->
diff --git a/composer.json b/composer.json
index ea33948a6..444aec3cf 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "keywords": ["timetracking", "projectmanagement", "invoicing"],
     "homepage": "https://github.com/kimai/kimai",
     "license": "GPL-3.0",
-    "version": "1.0.1",
+    "version": "1.1.0",
     "authors": [
         { "name": "Severin Leonhardt", "homepage": "https://github.com/ServiusHack" },
         { "name": "Kevin Papst", "homepage": "https://github.com/kevinpapst" }
diff --git a/includes/version.php b/includes/version.php
index 858916cba..36feba490 100644
--- a/includes/version.php
+++ b/includes/version.php
@@ -1,4 +1,4 @@
 <?php
-$kga['version'] = '1.0.1';
+$kga['version'] = '1.1.0';
 $kga['revision'] = 1389; // database revision number (incremented whenever the database changes)
 $kga['status'] = 'dev'; // leave blank if stable
diff --git a/kimai.json b/kimai.json
index 2633b16d5..883485043 100644
--- a/kimai.json
+++ b/kimai.json
@@ -1,7 +1,7 @@
 {
-    "time": "2016-07-03",
-    "version": "1.0.0",
-    "revision": "1387",
+    "time": "2016-08-23",
+    "version": "1.1.0",
+    "revision": "1389",
     "status": "stable",
     "news": "http://www.kimai.org/blog/2013/test-kimai-v0-9-3-beta-1/"
 }
\ No newline at end of file
diff --git a/updater/updater.php b/updater/updater.php
index bce3c27bf..b6f9b7efa 100644
--- a/updater/updater.php
+++ b/updater/updater.php
@@ -1122,11 +1122,12 @@
     exec_query("ALTER TABLE ${p}customers ADD COLUMN `country` varchar(2) NULL DEFAULT NULL AFTER `city`");
 }
 
+// release of kimai 1.1.0
+
 // ================================================================================
 // FINALIZATION: update DB version number
 // ================================================================================
-if ((int)$revisionDB < $kga['revision'] && !$errors)
-{
+if ((int)$revisionDB < $kga['revision'] && !$errors) {
     $query = sprintf("UPDATE `${p}configuration` SET value = '%s' WHERE `option` = 'version';", $kga['version']);
     exec_query($query, 0);