5f9501d4d8
Conflicts: erpnext/projects/doctype/project/project.txt |
||
---|---|---|
.. | ||
before_jan_2012 | ||
jan_mar_2012 | ||
mar_2012 | ||
old_patches | ||
print_formats | ||
__init__.py | ||
patch_list.py | ||
patch.py |
5f9501d4d8
Conflicts: erpnext/projects/doctype/project/project.txt |
||
---|---|---|
.. | ||
before_jan_2012 | ||
jan_mar_2012 | ||
mar_2012 | ||
old_patches | ||
print_formats | ||
__init__.py | ||
patch_list.py | ||
patch.py |