Hillel Coren a82437b2bc Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop ... Conflicts: app/Http/routes.php resources/lang/en/texts.php		2016-05-16 11:34:00 +03:00
..
deleted.blade.php	Added support for custom subdomains	2015-04-28 23:13:52 +03:00
edit.blade.php	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-05-16 11:34:00 +03:00
history.blade.php	Finalize multi-plan support	2016-04-18 22:35:18 -04:00
knockout.blade.php	Merge remote-tracking branch 'upstream/develop' into payments-changes	2016-05-10 10:25:42 -04:00
pdf.blade.php	Changes to support transifex.com	2016-05-15 23:16:08 +03:00
view.blade.php	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-05-11 09:28:55 +03:00