steenrabol 6133c6ff07 Merge branch 'master' of https://github.com/invoiceninja/invoiceninja ...

# Conflicts:
#	app/Http/Controllers/InvoiceController.php
#	resources/lang/en/texts.php
#	resources/views/invoices/edit.blade.php

2016-01-11 20:39:18 +01:00

..

CSV

Vendor

2016-01-07 16:21:13 +01:00

FreshBooks

Merge branch 'master' of https://github.com/invoiceninja/invoiceninja

2016-01-11 20:39:18 +01:00

Harvest

Merge branch 'master' of https://github.com/invoiceninja/invoiceninja

2016-01-11 20:39:18 +01:00

Hiveage

Merge branch 'master' of https://github.com/invoiceninja/invoiceninja

2016-01-11 20:39:18 +01:00

Invoiceable

Merge branch 'master' of https://github.com/invoiceninja/invoiceninja

2016-01-11 20:39:18 +01:00

Nutcache

Merge branch 'master' of https://github.com/invoiceninja/invoiceninja

2016-01-11 20:39:18 +01:00

Ronin

Merge branch 'master' of https://github.com/invoiceninja/invoiceninja

2016-01-11 20:39:18 +01:00

Wave

Merge branch 'master' of https://github.com/invoiceninja/invoiceninja

2016-01-11 20:39:18 +01:00

Zoho

Merge branch 'master' of https://github.com/invoiceninja/invoiceninja

2016-01-11 20:39:18 +01:00

BaseTransformer.php

Vendor management

2016-01-06 15:23:58 +01:00