BoykoAlex ba8af9f132 Merge branch 'master' into request-mappings ...

# Conflicts:
#	headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java
#	headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTest.java
#	headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/project/harness/MockRunningAppProvider.java
#	headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootApp.java
#	headless-services/commons/commons-boot-app-cli/src/test/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootAppTest.java

2017-10-26 21:04:44 -04:00

..

.settings

Moved commons and concourse editor to 'headless-services'

2017-04-06 17:21:53 -07:00

src/main/java/org/springframework/ide/vscode/commons

Merge branch 'master' into request-mappings

2017-10-26 21:04:44 -04:00

.classpath

Moved commons and concourse editor to 'headless-services'

2017-04-06 17:21:53 -07:00

.project

Moved commons and concourse editor to 'headless-services'

2017-04-06 17:21:53 -07:00

pom.xml

Bump version to 0.0.10

2017-08-21 16:57:38 +00:00