Mohit Panjwani 21cc2d7674 fix conflict

2019-11-14 19:46:55 +05:30

..

auth

fix conflicts

2019-11-14 15:51:48 +05:30

categories

init crater

2019-11-11 12:16:00 +05:30

components

init crater

2019-11-11 12:16:00 +05:30

customers

fix conflicts

2019-11-14 15:51:48 +05:30

dashboard

fix the change

2019-11-14 17:27:30 +05:30

errors

fix validation and translation issues

2019-11-11 13:44:24 +05:30

estimates

fix date display and other small issues

2019-11-14 19:41:33 +05:30

expenses

fix conflicts

2019-11-14 15:51:48 +05:30

invoices

fix date display and other small issues

2019-11-14 19:41:33 +05:30

items

fix the change

2019-11-14 17:27:30 +05:30

layouts

init crater

2019-11-11 12:16:00 +05:30

payments

fix conflicts

2019-11-14 15:51:48 +05:30

reports

fix conflicts

2019-11-14 15:51:48 +05:30

settings

fix conflicts

2019-11-14 15:51:48 +05:30

wizard

fix conflict

2019-11-14 19:46:55 +05:30