Merge branch '1.5.x' into 2.0.x

60788653 · Stephane Nicoll · 8950c3eb · ca7f961c · 60788653
Commit 60788653 authored Sep 03, 2018 by Stephane Nicoll
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

production-ready-features.adoc ...oot-docs/src/main/asciidoc/production-ready-features.adoc +1 -1

No files found.
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
@@ -1230,7 +1230,7 @@ Maven, you would add the following dependency:
 	<dependency>
 		<groupId>org.jolokia</groupId>
 		<artifactId>jolokia-core</artifactId>
- 	</dependency>
+	</dependency>
 ----

 The Jolokia endpoint can then be exposed by adding `jolokia` or `*` to the