Hillel Coren ebd258d655 Merge branch 'release-2.7.0' ... Conflicts: app/Http/Controllers/DashboardController.php app/Http/Requests/UpdateInvoiceRequest.php app/Http/routes.php composer.lock resources/views/payments/credit_card.blade.php		2016-09-12 13:36:53 +03:00
..
accounts
auth
clientauth
clients
credits
emails
errors
expense_categories
expenses
export
invited
invoices
partials
payments	Merge branch 'release-2.7.0'	2016-09-12 13:36:53 +03:00
public
reports
tasks
timesheets
users
vendor
vendors
client.blade.php
coming_soon.blade.php
dashboard.blade.php
datatable.blade.php
error.blade.php
export.blade.php
header.blade.php
list.blade.php
master.blade.php
money_script.blade.php
plans.blade.php
public_list.blade.php
secure_payment.blade.php
setup.blade.php
user_account.blade.php
vendor.blade.php