Troels Liebe Bentsen 33bb86ee85 Merge branch 'master' of github.com:tlbdk/invoice-ninja ... Conflicts: app/lang/en/texts.php		2014-11-02 18:56:58 +01:00
..
commands	Implement delete handling and do more checks to make sure we dont get corrupted ical files	2014-10-20 20:59:46 +02:00
config	Setting mail pretend default to false	2014-11-02 14:53:56 +02:00
controllers	Add company id and do minor fixes for vat number	2014-10-30 20:00:33 +01:00
database	Add company id and do minor fixes for vat number	2014-10-30 20:00:33 +01:00
handlers	Bug fixes	2014-03-23 21:38:03 +02:00
includes	Initial commit	2013-11-26 14:45:07 +02:00
lang	Merge branch 'master' of github.com:tlbdk/invoice-ninja	2014-11-02 18:56:58 +01:00
libraries	Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja	2014-10-20 19:10:04 +02:00
models	Add company id and do minor fixes for vat number	2014-10-30 20:00:33 +01:00
ninja	Add company id and do minor fixes for vat number	2014-10-30 20:00:33 +01:00
start	More work on the event importer and fix some module issues	2014-10-06 03:00:31 +02:00
storage	added empty directories	2014-01-15 14:04:45 +00:00
tests	Refactor code and do more work on import function	2014-10-06 20:42:07 +02:00
views	Merge branch 'master' of github.com:tlbdk/invoice-ninja	2014-11-02 18:56:58 +01:00
filters.php	Bug fixes	2014-10-26 22:13:50 +02:00
routes.php	Disable timesheet route for push request	2014-10-31 17:28:40 +01:00