mbauskar 966b3c156a [conflicts] resolved merge conflicts

2017-10-09 15:20:30 +05:30

..

__init__.py

Move subscription module to accounts (#10772)

2017-09-15 16:16:36 +05:30

add_healthcare_domain.py

[patch] To add healthcare domain (#11105)

2017-10-09 12:43:36 +05:30

fix_subscription_next_date.py

[Fix] Subscription end date, cancel issue, added from and to date

2017-10-03 17:45:11 +05:30

remove_subscription_module.py

Move subscription module to accounts (#10772)

2017-09-15 16:16:36 +05:30

set_schedule_date_for_material_request_and_purchase_order.py

Cleanup of PO schedule date pull requests

2017-10-05 19:51:10 +05:30

student_admission_childtable_migrate.py

test, patch, docs for student admission (#11075)

2017-10-09 12:41:24 +05:30