Merge branch '1.1.x' into 1.2.x

2019-03-19 11:35:06 +00:00
parent b9367a10c8 f7e61013bb
commit 3282a798cb
361 changed files with 362 additions and 362 deletions
--- a/docs/src/test/java/com/example/restassured/ParameterizedOutput.java
+++ b/docs/src/test/java/com/example/restassured/ParameterizedOutput.java
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,