Merge branch '2.1.x'

Closes gh-17325

Merge branch '2.1.x'
Closes gh-17325
a4fd1416 · Madhura Bhave · 361a9404 · 74912ee1 · a4fd1416
Commit a4fd1416 authored Jun 26, 2019 by Madhura Bhave
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

.gitignore .gitignore +0 -1

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -31,7 +31,6 @@ interpolated*.xml
 lib/
 manifest.yml
 overridedb.*
-settings.xml
 target
 transaction-logs
 .flattened-pom.xml