Fixed merge conflict

Browse Source

...

This commit is contained in:

Nabin Hait

2017-02-27 14:40:53 +05:30

parent c238016aff e0d661f433

commit c642f76a4d

22 changed files with 4591 additions and 4380 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

8687

erpnext/translations/pt.csv

File diff suppressed because it is too large Load Diff