• Rajeshekar's avatar
    Merge branch 'master' into MT-43 · 8dfe7e43
    Rajeshekar authored
    Conflicts:
    	src/main/java/com/nisum/mytime/controller/UserController.java
    	src/main/java/com/nisum/mytime/service/UserService.java
    	src/main/java/com/nisum/mytime/service/UserServiceImpl.java
    8dfe7e43
Name
Last commit
Last update
..
UpdateTeamMate.html Loading commit data...
ViewBillability.html Loading commit data...
addUpdateTravel.html Loading commit data...
addUpdateVisa.html Loading commit data...
attendanceReport.html Loading commit data...
dashboard.html Loading commit data...
emailTemplate.html Loading commit data...
employee.html Loading commit data...
employeeDetails.html Loading commit data...
employees.html Loading commit data...
footer.html Loading commit data...
header.html Loading commit data...
home.html Loading commit data...
index.html Loading commit data...
leftmenu.html Loading commit data...
login.html Loading commit data...
myOrg.html Loading commit data...
myProjectAllocations.html Loading commit data...
myTeam.html Loading commit data...
newProject.html Loading commit data...
newRoleTemplate.html Loading commit data...
newTeamMate.html Loading commit data...
onsiteTravelsList.html Loading commit data...
pdf-viewer.html Loading commit data...
profile.html Loading commit data...
progressDialog.html Loading commit data...
projectAssignedDetails.html Loading commit data...
projectDetails.html Loading commit data...
projectNotAssignedDetails.html Loading commit data...
projectTeamDetails.html Loading commit data...
projects.html Loading commit data...
registerEmployee.html Loading commit data...
reporteeTeam.html Loading commit data...
reportees.html Loading commit data...
reports.html Loading commit data...
resyncData.html Loading commit data...
roles.html Loading commit data...
shiftdetails.html Loading commit data...
updateProfile.html Loading commit data...
viewProjects.html Loading commit data...
visaList.html Loading commit data...