Joao 0d0af225f6 clean up conflict staging prompt, added to stageAll too		2017-08-28 10:57:23 +02:00
..
resources/icons	…
src	clean up conflict staging prompt, added to stageAll too	2017-08-28 10:57:23 +02:00
test	…
.vscodeignore	…
OSSREADME.json	…
npm-shrinkwrap.json	…
package.json	Merge branch 'master' into scm-multiroot	2017-08-25 11:36:39 +02:00
package.nls.json	…
tsconfig.json	…