commit | e1f46be230cf7d7eb948dec787f2d05367118081 | [log] [tgz] |
---|---|---|
author | Anand Doshi <anand@erpnext.com> | Tue Dec 15 14:37:11 2015 +0530 |
committer | Anand Doshi <anand@erpnext.com> | Tue Dec 15 14:37:11 2015 +0530 |
tree | e998b1b078af1c9e240ccecb29dbd89de2f101b3 | |
parent | 8ee5498fe0ebc2c3b25d1e9b208e727742118098 [diff] | |
parent | 81b8627250d52dfcee8557d3d5ef0f6f4799ec85 [diff] |
Merge branch 'ShashaQin-patch-60' into develop