Troels Liebe Bentsen d5306ef1cd Merge branch 'master' of github.com:tlbdk/invoice-ninja ... Conflicts: Gruntfile.js app/lang/en/texts.php bower.json public/built.css public/built.js		2014-10-30 18:42:26 +01:00
..
mailers	Added support for additional invoice designs	2014-10-24 13:48:59 +03:00
repositories	Merge branch 'master' of github.com:tlbdk/invoice-ninja	2014-10-30 18:42:26 +01:00