Saurabh 2ca83d61ea Resolve merge conflicts from enterprise_sprint branch		2018-05-14 21:15:46 +05:30
..
doctype	Resolve merge conflicts from enterprise_sprint branch	2018-05-14 21:15:46 +05:30
report	Fixed merge conflict	2018-03-23 16:20:27 +05:30
web_form	Rename schools to Education (#11524)	2017-11-23 15:22:10 +05:30
__init__.py	Rename schools to Education (#11524)	2017-11-23 15:22:10 +05:30
api.py	renamed color field	2018-05-01 18:55:17 +05:30
setup.py	Rename schools to Education (#11524)	2017-11-23 15:22:10 +05:30
utils.py	Minor fixes for the Education domain (#11758)	2017-11-28 18:04:08 +05:30