| commit | f8e248d051c68ac4b8b6e106dbb0edab80f480d3 | [log] [tgz] |
|---|---|---|
| author | Anand Doshi <anand@erpnext.com> | Tue Jan 08 19:38:23 2013 +0530 |
| committer | Anand Doshi <anand@erpnext.com> | Tue Jan 08 19:38:23 2013 +0530 |
| tree | d85fa5c7382985fdf5d8785427286dc945176841 | |
| parent | 6f88c6680ee00cf4030d5f3f5a97b36d06d8ecc8 [diff] | |
| parent | a2945e8e4b37bbedde1376cc8a94a9509fdcda7a [diff] |
Merge branch 'edge' of github.com:webnotes/erpnext into edge Conflicts: patches/january_2013/holiday_list_patch.py