latest changes
Merge branch 'master' of https://github.com/KevinMarete/ADT
Merge branch 'master' of https://github.com/wambuimungai/ADT

Conflicts:
	application/controllers/auto_management.php
	application/views/sections/link.php
	application/views/template.php
latest changes
Commit
changes
Latest changes

Signed-off-by: EuniceManyasi <eunismanyasi@gmail.com>
last changed

Signed-off-by: EuniceManyasi <eunismanyasi@gmail.com>
changes
changes
changes
changes
Merge branch 'master' of https://github.com/KevinMarete/ADT
changes
changes
changes
Merge branch 'master' of https://github.com/wambuimungai/ADT
changes
changes
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/views/sections/link.php