Merge pull request #5127 from xfxyjwf/merge
Merge 3.6.x branch to master
This commit is contained in:
commit
a6e1cc7e32
@ -10,11 +10,11 @@
|
||||
<email>protobuf-opensource@google.com</email>
|
||||
<active>yes</active>
|
||||
</lead>
|
||||
<date>2018-06-06</date>
|
||||
<date>2018-08-03</date>
|
||||
<time>11:02:07</time>
|
||||
<version>
|
||||
<release>3.6.0</release>
|
||||
<api>3.6.0</api>
|
||||
<release>3.6.1</release>
|
||||
<api>3.6.1</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
@ -245,6 +245,22 @@ G A release.
|
||||
<time>11:02:07</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>
|
||||
G A release.
|
||||
</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.6.1</release>
|
||||
<api>3.6.1</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<date>2018-08-03</date>
|
||||
<time>11:02:07</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>
|
||||
G A release.
|
||||
</notes>
|
||||
</release>
|
||||
|
Loading…
Reference in New Issue
Block a user