Stephane Nicoll ac9ee952c7 Properly merge fix ...

See gh-16666

2019-04-26 11:52:25 +03:00

..

spring-boot

Merge branch '1.5.x' into 2.0.x

2019-04-02 13:34:28 -07:00

spring-boot-actuator

Merge branch '1.5.x' into 2.0.x

2019-04-02 13:34:28 -07:00

spring-boot-actuator-autoconfigure

Merge branch '1.5.x' into 2.0.x

2019-04-02 13:34:28 -07:00

spring-boot-autoconfigure

Merge branch '1.5.x' into 2.0.x

2019-04-02 13:34:28 -07:00

spring-boot-cli

Merge branch '1.5.x' into 2.0.x

2019-04-03 09:52:28 +01:00

spring-boot-dependencies

Upgrade to Solr 6.6.6

2019-04-03 11:38:16 +01:00

spring-boot-devtools

Merge branch '1.5.x' into 2.0.x

2019-04-02 13:34:28 -07:00

spring-boot-docs

Properly merge fix

2019-04-26 11:52:25 +03:00

spring-boot-parent

…

spring-boot-properties-migrator

Merge branch '1.5.x' into 2.0.x

2019-03-20 16:45:26 +00:00

spring-boot-starters

Use HTTPS for external links wherever possible

2019-03-27 20:06:52 +00:00

spring-boot-test

Merge branch '1.5.x' into 2.0.x

2019-04-02 13:34:28 -07:00

spring-boot-test-autoconfigure

Merge branch '1.5.x' into 2.0.x

2019-04-02 13:34:28 -07:00

spring-boot-tools

Merge branch '1.5.x' into 2.0.x

2019-04-02 20:48:00 -07:00

pom.xml

…