gandhimathi a562819967 Merge remote-tracking branch 'origin/master' ... # Conflicts: # Apollo/api/application/config/routes.php # Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php # Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php		2018-09-08 19:58:15 +05:30
..
config	status file	2017-12-07 11:31:25 +05:30
controllers	Merge remote-tracking branch 'origin/master'	2018-09-08 19:58:15 +05:30
directives	enrolment upload model	2018-09-05 11:31:18 +05:30
filters	daybook details screen enable printpdf option : kdk	2018-08-24 15:57:19 +05:30
tableExport	daybook changes , view changes : kdk	2018-08-16 18:06:21 +05:30
app.js	select2 in status screen	2018-03-21 17:03:42 +05:30
config.constant.js	data correction screen for student merge	2018-09-06 16:52:19 +05:30
config.router.js	data correction menu change	2018-09-08 14:31:33 +05:30
main.js	footer changes	2018-08-22 10:01:37 +05:30