Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-24 15:59:41 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/release/2.9' into develop

Browse source 
# Conflicts:
#	api/http/handler/websocket/shell_pod.go
#	app/portainer/components/box-selector/box-selector-item/box-selector-item.html
#	app/portainer/rbac/components/access-viewer/access-viewer-datatable/access-viewer-datatable.html
#	app/portainer/settings/authentication/ldap/ad-settings/ad-settings.html
#	app/portainer/settings/authentication/ldap/index.js
#	app/portainer/settings/authentication/ldap/ldap-settings-custom/ldap-settings-custom.html
#	app/portainer/settings/authentication/ldap/ldap-settings.model.js
#	app/portainer/settings/authentication/ldap/ldap-settings/ldap-settings.controller.js
#	app/portainer/views/settings/authentication/settingsAuthenticationController.js
This commit is contained in:
Simon Meng 2021-10-26 10:58:19 +13:00
commit db00390cd2
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/portainer.go
View file

@ -1470,7 +1470,7 @@ type (
const (
// APIVersion is the version number of the Portainer API
APIVersion = "2.9.1"
APIVersion = "2.9.2"
// DBVersion is the version number of the Portainer database
DBVersion = 33
// ComposeSyntaxMaxVersion is a maximum supported version of the docker compose syntax