Merge branch 'master' of github.com:akaunting/akaunting into 2.1-dev
# Conflicts: # composer.lock # resources/views/banking/accounts/index.blade.php # resources/views/banking/reconciliations/index.blade.php # resources/views/banking/transactions/index.blade.php # resources/views/banking/transfers/index.blade.php # resources/views/common/items/index.blade.php # resources/views/common/reports/index.blade.php # resources/views/purchases/bills/index.blade.php # resources/views/purchases/payments/index.blade.php # resources/views/purchases/vendors/index.blade.php # resources/views/sales/customers/index.blade.php # resources/views/sales/invoices/index.blade.php # resources/views/sales/revenues/index.blade.php
This commit is contained in:
		@@ -10,15 +10,15 @@ return [
 | 
			
		||||
 | 
			
		||||
    'minor'     =>  '0',
 | 
			
		||||
 | 
			
		||||
    'patch'     =>  '23',
 | 
			
		||||
    'patch'     =>  '24',
 | 
			
		||||
 | 
			
		||||
    'build'     =>  '',
 | 
			
		||||
 | 
			
		||||
    'status'    =>  'Stable',
 | 
			
		||||
 | 
			
		||||
    'date'      =>  '23-September-2020',
 | 
			
		||||
    'date'      =>  '21-October-2020',
 | 
			
		||||
 | 
			
		||||
    'time'      =>  '12:00',
 | 
			
		||||
    'time'      =>  '14:00',
 | 
			
		||||
 | 
			
		||||
    'zone'      =>  'GMT +3',
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user