parent: 259d98 | patch | commitdiff
rsanchez
2017-03-15 a6284a2da0f9a69ba4495b23e52aaba5fc5745b7
refs
author rsanchez <rsanchez@curisit.net>
Wednesday, March 15, 2017 15:51 +0000
committer rsanchez <rsanchez@curisit.net>
Wednesday, March 15, 2017 15:51 +0000
commita6284a2da0f9a69ba4495b23e52aaba5fc5745b7
tree 62e8cbd3cf871f2063ba9a50e4a44e079b27e94b tree | zip | gz
parent 259d989404ffbb541b26d7fb687581e2b57111ae 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
1 files modified
changed files
securis/src/main/webapp/src/app/app.module.ts diff | view | blame | history