Merge branch 'master' into release/spring-3.0

# Conflicts: # Changelog.md # pom.xml
arangodb · Sep 21, 2023 · b861161 · b861161
2 parents 786f060 + f6e67e3
commit b861161
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -4,9 +4,11 @@ on:
   pull_request:
     branches:
       - master
+      - release/**
   push:
     branches:
       - master
+      - release/**
 
 jobs:
 

diff --git a/Changelog.md b/Changelog.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
+## [3.1-1] - 2023.09.21
+
+- re-enabled bean method proxies (#23)
+
 ## [3.0-1] - 2023.09.21
 
 - re-enabled bean method proxies (#23)