7e2010a649
Conflicts: patches/patch_list.py projects/doctype/project/project.py utilities/transaction_base.py
Conflicts: patches/patch_list.py projects/doctype/project/project.py utilities/transaction_base.py