Merge pull request #2077 from mockito/sf2

Retry 3.6.0 release

[ci maven-central-release]

doc/release-notes/official.md

@@ -1,9 +1,5 @@
 <sup><sup>*Release notes were automatically generated by [Shipkit](http://shipkit.org/)*</sup></sup>
 
-#### 3.6.0
- - 2020-10-24 - [1 commit](https://github.com/mockito/mockito/compare/v3.5.15...v3.6.0) by [Tim van der Lippe](https://github.com/TimvdLippe) - published to [![Bintray](https://img.shields.io/badge/Bintray-3.6.0-green.svg)](https://bintray.com/mockito/maven/mockito/3.6.0)
- - No pull requests referenced in commit messages.
-
 #### 3.5.15
  - 2020-10-19 - [4 commits](https://github.com/mockito/mockito/compare/v3.5.14...v3.5.15) by [Rafael Winterhalter](https://github.com/raphw) - published to [![Bintray](https://img.shields.io/badge/Bintray-3.5.15-green.svg)](https://bintray.com/mockito/maven/mockito/3.5.15)
  - Mock resolver plugin [(#2042)](https://github.com/mockito/mockito/pull/2042)

version.properties

@@ -1,5 +1,5 @@
 # Currently building Mockito version
-version=3.6.1
+version=3.6.0
 
 # Previous version used to generate release notes delta
-previousVersion=3.6.0
+previousVersion=3.5.15