1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-11 13:42:49 +01:00
invoiceninja/app/Ninja
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
..
Datatables Rollback to 2.6.5 2016-07-21 15:35:23 +03:00
Import Added website field to client CSV import 2016-07-04 21:33:50 +03:00
Intents Enabled adding expense to open invoice 2016-08-21 18:25:35 +03:00
Mailers Working on the bot 2016-08-13 22:19:37 +03:00
Notifications Code Refactoring 2016-07-03 16:19:22 +00:00
PaymentDrivers Merge branch 'release-2.7.0' 2016-09-12 13:36:53 +03:00
Presenters Working on history sidebar 2016-08-31 22:10:41 +03:00
Repositories Working on the dashboard 2016-09-11 20:05:59 +03:00
Serializers Code Refactoring 2016-07-03 16:19:22 +00:00
Transformers Add updated_at into Activity Transformer 2016-08-17 18:56:31 +10:00