Merge branch '1.5.x' into 2.0.x

2024-09-03 04:26:12 +08:00 · 2018-09-05 13:40:48 -07:00 · 2018-09-05 13:40:48 -07:00 · ec27137632
commit ec27137632
parent b580dd70f8 a9e8116a99
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockReset.java
+++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockReset.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.