estimate mail send and attachment#26sep
estimate show mail content#26sep
recurring send mail #27sep
recurring model#30sep
conflicts remove #30sep
recurring#1oct
conflicts remove#1oct
conflicts remove in multiple files#1oct
Merge pull request #447 from vaibhavcisin274/poonam

Poonam
admin+offline_payment
Merge branch 'master' of github.com:vaibhavcisin274/invoice-project into poonam
Merge pull request #448 from vaibhavcisin274/poonam

Poonam
activeadmin & dashboard#8oct
conflicts remove#8oct
Merge pull request #446 from vaibhavcisin274/prachi

Prachi
workin on client login info send
remove conflicts
Merge pull request #449 from vaibhavcisin274/anshul

Anshul
Merge branch 'master' of github.com:vaibhavcisin274/invoice-project into poonam
changes