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:
Cüneyt Şentürk
2020-10-22 18:03:20 +03:00
114 changed files with 2409 additions and 1587 deletions

View File

@@ -4,7 +4,7 @@
@can('create-auth-roles')
@section('new_button')
<a href="{{ route('roles.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
<a href="{{ route('roles.create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a>
@endsection
@endcan