diff --git a/CHANGELOG.md b/CHANGELOG.md
index c01e878217..0ffb31e1ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,19 @@
 # Changelog
 
 
+## [1.26.0](https://github.com/windmill-labs/windmill/compare/v1.25.0...v1.26.0) (2022-07-29)
+
+
+### Features
+
+* resource type picker in schema modal + proper initialization of raw javascript editor when applicable ([01bb107](https://github.com/windmill-labs/windmill/commit/01bb107a0f3e3899ec99718974b2484ab5978c92))
+
+
+### Bug Fixes
+
+* forloop flows unsoundness fix part I ([1b5ce32](https://github.com/windmill-labs/windmill/commit/1b5ce3243b364d02903072a9af5e15447622e9fb))
+* small bar mode and editor nits ([4e3a02a](https://github.com/windmill-labs/windmill/commit/4e3a02a8e44e25e6b5402f732b9af6969d06dcc0))
+
 ## [1.25.0](https://github.com/windmill-labs/windmill/compare/v1.24.2...v1.25.0) (2022-07-29)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index ae3d091206..e46fba73ee 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -4504,7 +4504,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.25.0"
+version = "1.26.0"
 dependencies = [
  "anyhow",
  "argon2",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index a23a155eb4..dd1e812005 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.25.0"
+version = "1.26.0"
 authors = ["Ruben Fiszel <ruben@rubenfiszel.com>"]
 edition = "2021"
 
diff --git a/backend/openapi.yaml b/backend/openapi.yaml
index 13b0bcb856..8cbb56e3dd 100644
--- a/backend/openapi.yaml
+++ b/backend/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.25.0
+  version: 1.26.0
   title: Windmill server API
   contact:
     name: Windmill contact
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 87c7298c41..de0fe62a2f 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill",
-	"version": "1.25.0",
+	"version": "1.26.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill",
-			"version": "1.25.0",
+			"version": "1.26.0",
 			"dependencies": {
 				"@fortawesome/free-brands-svg-icons": "^6.1.2",
 				"@fortawesome/free-solid-svg-icons": "^6.1.2",
diff --git a/frontend/package.json b/frontend/package.json
index 02b0f34a45..149dc0e37c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill",
-	"version": "1.25.0",
+	"version": "1.26.0",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index c0fb7b5549..d5a2babae7 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.25.0"
-wmill_pg = ">=1.25.0"
+wmill = ">=1.26.0"
+wmill_pg = ">=1.26.0"
 requests = "*"
 sendgrid = "*"
 psycopg2-binary = "*"
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index b686e09f73..52ae52c3d9 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.25.0"
+version = "1.26.0"
 description = "A client library for accessing Windmill server wrapping the Windmill client API"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
@@ -16,7 +16,7 @@ include = ["wmill/py.typed"]
 
 [tool.poetry.dependencies]
 python = "^3.7"
-windmill-api = "^1.25.0"
+windmill-api = "^1.26.0"
 
 [build-system]
 requires = ["poetry>=1.0.2", "poetry-dynamic-versioning"]
diff --git a/python-client/wmill_pg/pyproject.toml b/python-client/wmill_pg/pyproject.toml
index 7e8b8202ee..5de6abfde9 100644
--- a/python-client/wmill_pg/pyproject.toml
+++ b/python-client/wmill_pg/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill-pg"
-version = "1.25.0"
+version = "1.26.0"
 description = "An extension client for the wmill client library focused on pg"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/version.txt b/version.txt
index ad2191947f..5ff8c4f5d2 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.25.0
+1.26.0