email part changed
Merge branch 'master' of github.com:techvision/intranet into development
Merge branch 'master' of https://github.com/techvision/intranet
Have resolved conflicts and improve html tags
email changed
disabeling functionality added for approve and reject pertial
Merge branch 'master' of github.com:techvision/intranet into development
Have changed schedule.rb and corrected the year entry
Hve corrected br tags. Have deleted back files.