diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml index 002ee5951..c8943b9d1 100644 --- a/.github/workflows/dockerhub.yml +++ b/.github/workflows/dockerhub.yml @@ -3,9 +3,9 @@ name: CI to Docker Hub on: push: tags: ['*'] - branches: [ master ] + branches: [ 'master', 'stable-*' ] pull_request: - branches: [ master ] + branches: [ 'master', 'stable-*' ] jobs: diff --git a/.github/workflows/test-docs.yml b/.github/workflows/test-docs.yml index dfdc83760..aaf778558 100644 --- a/.github/workflows/test-docs.yml +++ b/.github/workflows/test-docs.yml @@ -2,9 +2,9 @@ name: Test & Docs on: push: - branches: [ master ] + branches: [ 'master', 'stable-*' ] pull_request: - branches: [ master ] + branches: [ 'master', 'stable-*' ] jobs: build: diff --git a/CHANGELOG.md b/CHANGELOG.md index e32bc7ded..8e0e3f18e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,18 @@ This document describes changes between each past release. -## 6.1.2 (unreleased) +## 6.2.0 (unreleased) - Nothing changed yet. +## 6.1.2 (2023-11-19) + +- Fix password generation command line crash (#1242) +- Update to flask and werkzeug 2.3 (#1244) + + ## 6.1.1 (2023-10-04) ### Currency conversion API workarounds diff --git a/pyproject.toml b/pyproject.toml index 5212054b1..13af5cde4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "ihatemoney" -version = "6.1.2.dev0" +version = "6.2.0.dev0" description = "A simple shared budget manager web application." readme = "README.md" license = {file = "LICENSE"}