Merge branch 'master' of github.com:oetiker/callbackery

oetiker · Jun 12, 2023 · 66d2e55 · 66d2e55
2 parents ba2bce1 + 93b1caf
commit 66d2e55
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+0.46.1 2023-05-23 12:12:33 +0200 Tobias Oetiker <[email protected]>
+
+ - resync branches
+
 0.46.0 2023-05-23 12:05:29 +0200 Tobias Oetiker <[email protected]>
 
  - the methodes 'show' and 'hide' clash with the attributes 
@@ -15,6 +19,9 @@
 0.45.0 2023-05-23 12:05:01 +0200 Tobias Oetiker <[email protected]>
 
  -
+=======
+0.45.1 2023-05-08 10:52:48 +0200 Tobias Oetiker <[email protected]>
+>>>>>>> 93b1caf4debb55a06a72ad1d38134bb1f4173bf4
 
  - Reload CardList on action response
 

diff --git a/lib/CallBackery.pm b/lib/CallBackery.pm
@@ -37,8 +37,7 @@ use CallBackery::Plugin::Doc;
 use CallBackery::Database;
 use CallBackery::User;
 
-
-our $VERSION = '0.46.0';
+our $VERSION = '0.46.1';
 
 
 =head2 config