common/securis.git

Merge branch 'angular2' of https://rsanchez@git.curisit.net/gitblit/git/com...

rsanchez

2017-03-15 259d989404ffbb541b26d7fb687581e2b57111ae

refs
author	rsanchez <rsanchez@curisit.net>
	Wednesday, March 15, 2017 15:46 +0000
committer	rsanchez <rsanchez@curisit.net>
	Wednesday, March 15, 2017 15:46 +0000
commit	259d989404ffbb541b26d7fb687581e2b57111ae
tree	32f0fc59408ebd0a2d70277125f612163cdfa656 tree \| zip \| gz
parent	a6b5178c7295be4525ee0f607e42f72a12a2e3d6 view \| diff abb9cc75e166c32cfa97244c497e6a69d14ea114 view \| diff

Merge branch 'angular2' of
https://rsanchez@git.curisit.net/gitblit/git/common/securis.git into
angular2

Conflicts:
	securis/src/main/webapp/src/app/app.module.ts

6 files added

6 files modified

	securis/src/main/webapp/src/app/app.module.ts	diff \| view \| blame \| history
	securis/src/main/webapp/src/app/app.routes.ts	diff \| view \| blame \| history
	securis/src/main/webapp/src/app/footer.component.html	diff \| view \| blame \| history
	securis/src/main/webapp/src/app/footer.component.ts	diff \| view \| blame \| history
	securis/src/main/webapp/src/app/home.component.html	diff \| view \| blame \| history
	securis/src/main/webapp/src/app/home.component.ts	diff \| view \| blame \| history
	securis/src/main/webapp/src/app/login.form.component.ts	diff \| view \| blame \| history
	securis/src/main/webapp/src/app/menu.component.html	diff \| view \| blame \| history
	securis/src/main/webapp/src/app/menu.component.ts	diff \| view \| blame \| history
	securis/src/main/webapp/src/app/nomenu.component.html	diff \| view \| blame \| history
	securis/src/main/webapp/src/app/nomenu.component.ts	diff \| view \| blame \| history
	securis/src/main/webapp/src/app/user.service.ts	diff \| view \| blame \| history