Mohit Panjwani db4c7f5e32 fix merge conflicts

2020-01-05 13:45:10 +05:30

..

ar.json

fix merge conflicts

2020-01-05 13:45:10 +05:30

de.json

Fix Invoice/Estimate template issues and Add Payment Receipt, Custom Payment Modes and Item units

2020-01-05 07:22:36 +00:00

en.json

fix merge conflicts

2020-01-05 13:45:10 +05:30

es.json

fix merge conflicts

2020-01-05 13:45:10 +05:30

fr.json

fix merge conflicts

2020-01-05 13:45:10 +05:30

i18n.js

fix merge conflicts

2020-01-05 13:45:10 +05:30

pt-br.json

Translations Updates

2020-01-03 17:21:43 +01:00