Kris De Volder 546a81c3ce Merge branch 'master' of github.com:spring-projects/sts4 ...

Conflicts:
	headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalsLiveHoverProvider.java

2017-11-03 09:59:47 -07:00

..

.settings

Save action preferences

2017-04-20 14:32:39 -07:00

src

Merge branch 'master' of github.com:spring-projects/sts4

2017-11-03 09:59:47 -07:00

.classpath

Split vscode-boot-java to separate out language-server

2017-04-07 14:36:23 -07:00

.project

Split vscode-boot-java to separate out language-server

2017-04-07 14:36:23 -07:00

build.sh

Remove -U flag from mvn builds for better use of mvn cache

2017-04-14 10:52:23 -07:00

pom.xml

Add parsing of LiveBeanModel to actuator client

2017-10-25 13:40:57 -07:00