1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-22 17:31:35 +02:00
invoiceninja/resources
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
..
assets Set up D3.js with Elixir 2016-07-24 13:31:25 +02:00
lang Merge branch 'release-2.6.9' 2016-08-14 09:07:44 +03:00
views Fix for cvv/cvc 2016-08-14 08:54:16 +03:00