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

..

pagination.php

Working on OFX support

2016-01-26 22:22:33 +02:00

passwords.php

Update English and German lang files for PSR-2 compliance

2015-10-22 20:05:06 +02:00

reminders.php

Update English and German lang files for PSR-2 compliance

2015-10-22 20:05:06 +02:00

texts.php

Merge branch 'release-2.6.9'

2016-08-14 09:07:44 +03:00

validation.php

Working on OFX support

2016-01-26 22:22:33 +02:00