Troels Liebe Bentsen 8ca8cc91b1 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja ... Conflicts: composer.lock		2014-10-14 23:48:59 +02:00
..
entity.php	Implemented notifications	2013-12-25 16:34:42 -05:00
timesheet_utils.php	Did more work on update logic and added timing	2014-10-07 23:37:06 +02:00
utils.php	Version check and news feed messages	2014-10-06 00:00:42 +03:00