| commit | aaf1895a128ddc09da509fa5b4de0f5d52cbac44 | [log] [tgz] |
|---|---|---|
| author | Anand Doshi <anand@erpnext.com> | Fri Sep 11 16:35:17 2015 +0530 |
| committer | Anand Doshi <anand@erpnext.com> | Fri Sep 11 16:35:17 2015 +0530 |
| tree | 802d5d6c69f850cb8fac1296240b7043a4e60611 | |
| parent | 121176f0e9a170628d63fe29763dadfdf2f29000 [diff] | |
| parent | 979326b0b16140a2b670bf93fef11e4ebafec6e9 [diff] |
Merge branch 'nabinhait-multi-currency' into develop Conflicts: erpnext/accounts/doctype/journal_entry/journal_entry.json