Hillel Coren cc46f1fa60 Merge branch 'master' of git://github.com/fabianmarz/invoice-ninja into fabianmarz-master ... Conflicts: app/lang/de/texts.php		2015-02-26 15:10:44 +02:00
..
commands	Fixed incorrect create_at activity timestamps	2015-02-26 15:06:24 +02:00
config	Bug fixes	2015-01-11 13:56:58 +02:00
controllers	Removed deleted and added archived records to the chart builder	2015-02-26 15:06:44 +02:00
database	Added Swiss Franc	2015-02-18 14:59:25 +02: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 git://github.com/fabianmarz/invoice-ninja into fabianmarz-master	2015-02-26 15:10:44 +02:00
libraries	Enabled fixed amount discounts	2014-12-04 00:05:38 +02:00
models	Bug fixes and check-data script	2015-02-26 00:11:00 +02:00
ninja	Bug fixes and check-data script	2015-02-26 00:11:00 +02:00
start	Bug fixes and check-data script	2015-02-26 00:11:00 +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 git://github.com/fabianmarz/invoice-ninja into fabianmarz-master	2015-02-26 15:10:44 +02:00
filters.php	Implemented setup page	2014-11-28 15:34:01 +02:00
routes.php	Bug fixes and check-data script	2015-02-26 00:11:00 +02:00