Merge branch 'master' of github.com:akaunting/akaunting into 2.1-dev

# Conflicts: # composer.lock
2020-11-11 18:48:33 +03:00
parent 96963ef0e1 cfc548d3ce
commit 72231b10ce
8 changed files with 61 additions and 28 deletions
--- a/config/version.php
+++ b/config/version.php
@@ -10,15 +10,15 @@ return [

    'minor'     =>  '0',

-    'patch'     =>  '24',
+    'patch'     =>  '25',

    'build'     =>  '',

    'status'    =>  'Stable',

-    'date'      =>  '21-October-2020',
+    'date'      =>  '26-October-2020',

-    'time'      =>  '14:00',
+    'time'      =>  '15:00',

    'zone'      =>  'GMT +3',