Merge branch 'master' of github.com:akaunting/akaunting

# Conflicts: # resources/views/banking/reconciliations/create.blade.php
2020-06-08 23:13:38 +03:00
parent d4923b4414 5e51b494d2
commit 41e7aee498
391 changed files with 6324 additions and 2309 deletions
--- a/resources/lang/en-GB/modules.php
+++ b/resources/lang/en-GB/modules.php
@ -9,7 +9,6 @@ return [
    'new'                   => 'New',
    'top_free'              => 'Top Free',
    'free'                  => 'FREE',
-    'search'                => 'Search',
    'install'               => 'Install',
    'buy_now'               => 'Buy Now',
    'get_api_key'           => '<a href=":url" target="_blank">Click here</a> to get your API key.',