Commit Graph
2 Commits
Author SHA1 Message Date
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 1ca9cc0ed6 Fix vagrant key / ubuntu gulp issues 2020-05-20 12:04:28 +02:00