5 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thilina Pituwala	d91283912e	Adding docker development env	2020-05-21 12:07:58 +02:00
Thilina Pituwala	a7ef560f79	Merge branch 'master' into develop	2020-05-20 21:22:34 +02:00
Thilina Pituwala	ae78c85806	Merge branch 'master' of github.com:gamonoid/icehrm ... # Conflicts: # package-lock.json	2020-05-20 21:18:44 +02:00
Thilina Pituwala	7453a58aad	Latest updates from IceHrmPro	2020-05-20 18:47:29 +02:00
Thilina Pituwala	1ca9cc0ed6	Fix vagrant key / ubuntu gulp issues	2020-05-20 12:04:28 +02:00