9:41
9:42
2:56
Merge branch 'HEAD' of https://github.com/AndreeaUrsulescu/issue-tracker.git

Conflicts:
	src/main/webapp/WEB-INF/views/main/viewIssue.jsp
5:24
Merge branch 'HEAD' of https://github.com/AndreeaUrsulescu/issue-tracker.git
Merge branch 'HEAD' of https://github.com/AndreeaUrsulescu/issue-tracker.git
Merge branch 'HEAD' of https://github.com/AndreeaUrsulescu/issue-tracker.git
Signed-off-by: CiprianTalmacel <cprn_talmacel@yahoo.com>