From 46d8dba13734ad12ec60f8ec89467353d9fbd352 Mon Sep 17 00:00:00 2001
From: Duvel <remco@dieselwalm.nl>
Date: Mon, 11 Dec 2017 15:50:59 +0100
Subject: [PATCH 1/3] style(networks): change the label of the add button
 (#1495)

---
 .../ui/datatables/networks-datatable/networksDatatable.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/directives/ui/datatables/networks-datatable/networksDatatable.html b/app/directives/ui/datatables/networks-datatable/networksDatatable.html
index 066486963..8dcf9846e 100644
--- a/app/directives/ui/datatables/networks-datatable/networksDatatable.html
+++ b/app/directives/ui/datatables/networks-datatable/networksDatatable.html
@@ -17,7 +17,7 @@
           <i class="fa fa-trash space-right" aria-hidden="true"></i>Remove
         </button>
         <button type="button" class="btn btn-sm btn-primary" ui-sref="actions.create.network">
-          <i class="fa fa-plus space-right" aria-hidden="true"></i>Add volume
+          <i class="fa fa-plus space-right" aria-hidden="true"></i>Add network
         </button>
       </div>
       <div class="searchBar" ng-if="$ctrl.state.displayTextFilter">

From d0da9860af1def26f3e4b6adfe9016bd30caacba Mon Sep 17 00:00:00 2001
From: Anthony Lapenna <lapenna.anthony@gmail.com>
Date: Mon, 11 Dec 2017 16:03:00 +0100
Subject: [PATCH 2/3] style(datatables): use normal font weight for table
 headers (#1496)

---
 assets/css/app.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/assets/css/app.css b/assets/css/app.css
index aa2e3b644..341cdcd67 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -124,6 +124,10 @@ a[ng-click]{
   font-size: 90% !important;
 }
 
+.widget .widget-body table thead th {
+  font-weight: normal;
+}
+
 .template-widget {
   height: 100%;
 }

From fbd9139928bb022f2793d73612a56dee58b50675 Mon Sep 17 00:00:00 2001
From: Anthony Lapenna <lapenna.anthony@gmail.com>
Date: Mon, 11 Dec 2017 16:03:53 +0100
Subject: [PATCH 3/3] chore(version): bump version number

---
 api/portainer.go            | 2 +-
 api/swagger.yaml            | 4 ++--
 distribution/portainer.spec | 2 +-
 package.json                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/api/portainer.go b/api/portainer.go
index 8fc8588ef..92d2afd9c 100644
--- a/api/portainer.go
+++ b/api/portainer.go
@@ -390,7 +390,7 @@ type (
 
 const (
 	// APIVersion is the version number of the Portainer API.
-	APIVersion = "1.15.4"
+	APIVersion = "1.15.5"
 	// DBVersion is the version number of the Portainer database.
 	DBVersion = 7
 	// DefaultTemplatesURL represents the default URL for the templates definitions.
diff --git a/api/swagger.yaml b/api/swagger.yaml
index f2646abb4..f2acb8fad 100644
--- a/api/swagger.yaml
+++ b/api/swagger.yaml
@@ -56,7 +56,7 @@ info:
 
     **NOTE**: You can find more information on how to query the Docker API in the [Docker official documentation](https://docs.docker.com/engine/api/v1.30/) as well as in [this Portainer example](https://gist.github.com/deviantony/77026d402366b4b43fa5918d41bc42f8).
 
-  version: "1.15.4"
+  version: "1.15.5"
   title: "Portainer API"
   contact:
     email: "info@portainer.io"
@@ -1869,7 +1869,7 @@ definitions:
         description: "Is analytics enabled"
       Version:
         type: "string"
-        example: "1.15.4"
+        example: "1.15.5"
         description: "Portainer API version"
   PublicSettingsInspectResponse:
     type: "object"
diff --git a/distribution/portainer.spec b/distribution/portainer.spec
index 90f73b657..3509cf0ea 100644
--- a/distribution/portainer.spec
+++ b/distribution/portainer.spec
@@ -1,5 +1,5 @@
 Name:           portainer
-Version:        1.15.4
+Version:        1.15.5
 Release:        0
 License:        Zlib
 Summary:        A lightweight docker management UI
diff --git a/package.json b/package.json
index 3c0d5e2a4..80dabfe94 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "author": "Portainer.io",
   "name": "portainer",
   "homepage": "http://portainer.io",
-  "version": "1.15.4",
+  "version": "1.15.5",
   "repository": {
     "type": "git",
     "url": "git@github.com:portainer/portainer.git"