Nabin Hait 6e9d2a3c1f fixed conflict		2017-01-09 17:21:34 +05:30
..
doctype	fixed conflict	2017-01-09 17:21:34 +05:30
report	Email ID renamed to Email Address	2017-01-03 16:45:38 +05:30
web_form	Email ID renamed to Email Address	2017-01-03 16:45:38 +05:30
__init__.py	Merge ERPNext Schools into ERPNext	2016-07-20 19:25:02 +05:30
api.py	Renamed Student Batch Attendance Tool to Student Attendance Tool	2016-12-09 17:41:09 +05:30
utils.py	Added Student Batch	2016-07-22 15:45:42 +05:30