Merge branch 'release/2.5' into develop

api/portainer.go

@@ -1327,7 +1327,7 @@ type (
 
 const (
 	// APIVersion is the version number of the Portainer API
-	APIVersion = "2.5.0"
+	APIVersion = "2.5.1"
 	// DBVersion is the version number of the Portainer database
 	DBVersion = 27
 	// ComposeSyntaxMaxVersion is a maximum supported version of the docker compose syntax

package.json

@@ -2,7 +2,7 @@
   "author": "Portainer.io",
   "name": "portainer",
   "homepage": "http://portainer.io",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "repository": {
     "type": "git",
     "url": "git@github.com:portainer/portainer.git"