| commit | 646d06ee9facfc3e7208670efc03c4d4d14979f0 | [log] [tgz] |
|---|---|---|
| author | Nabin Hait <nabinhait@gmail.com> | Fri Jan 31 16:28:05 2014 +0530 |
| committer | Nabin Hait <nabinhait@gmail.com> | Fri Jan 31 16:28:05 2014 +0530 |
| tree | 1507de945ab4fb4211fbc01a906ecc823426d735 | |
| parent | 45f0c25a6d368492f673b3e4c7f77a3a743ae297 [diff] | |
| parent | fe977289ebe4dd1c15dec5d51b202f768c38d580 [diff] |
Merge branch 'develop' of github.com:webnotes/erpnext into 4.0.0-wip Conflicts: config.json