Modification#6sep
Merge branch 'master' of github.com:vaibhavcisin274/invoice-project into prachi
#7sep morning
expense error remove#7sep
solve the issue of id in expense
ckeditor with reg. confirmation mail#10sep
model for ckeditor form
remove conflicts
#11sep morng commit
new model#11sep
conflicts remove
user mailer#11sep
Merge branch 'master' of github.com:vaibhavcisin274/invoice-project into prachi
Merge branch 'master' of github.com:vaibhavcisin274/invoice-project into prachi
Merge pull request #382 from vaibhavcisin274/anshul

working on token system
email functionality#12sep
remove conflicts#12sep
conflicts remove from prachi branch
Merge pull request #370 from vaibhavcisin274/prachi

Prachi
13-sep assocition to current user latefee/charges/taxes and set date format