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
..
ClientTransformer.php	Working on data import tranformers	2016-01-06 09:52:26 +02:00
InvoiceTransformer.php	Working on data import tranformers	2016-01-06 09:52:26 +02:00
PaymentTransformer.php	Removed getInvoiceId from non-Wave transformers	2015-12-31 16:14:30 +02:00
VendorTransformer.php	Vendor	2016-01-07 16:21:13 +01:00