1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-11 13:42:49 +01:00
invoiceninja/app/Ninja
Hillel Coren c7c253fbd8 Merge branch 'release-2.6.9'
Conflicts:
	app/Http/routes.php
	app/Ninja/PaymentDrivers/BasePaymentDriver.php
	composer.lock
	resources/lang/en/texts.php
	resources/views/reports/chart_builder.blade.php
2016-08-14 09:07:44 +03:00
..
Datatables
Import
Intents Working on the bot 2016-08-13 22:19:37 +03:00
Mailers Working on the bot 2016-08-13 22:19:37 +03:00
Notifications
PaymentDrivers Merge branch 'release-2.6.9' 2016-08-14 09:07:44 +03:00
Presenters
Repositories Working on the bot 2016-08-13 22:19:37 +03:00
Serializers
Transformers