aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2018-09-17 13:41:25 -0700
committerGitHub <noreply@github.com>2018-09-17 13:41:25 -0700
commita6e1cc7e328c45a0cb9856c530c8f6cd23314163 (patch)
treed29ee80639d4c1c6ed2f9c32a3ba0cb9cc64df4a
parentff3891dab1b1f462d90a68666d14f57eb5fea34f (diff)
parente49bd660345fb8e014790441b62d14be21e5ae03 (diff)
downloadprotobuf-a6e1cc7e328c45a0cb9856c530c8f6cd23314163.tar.gz
protobuf-a6e1cc7e328c45a0cb9856c530c8f6cd23314163.tar.bz2
protobuf-a6e1cc7e328c45a0cb9856c530c8f6cd23314163.zip
Merge pull request #5127 from xfxyjwf/merge
Merge 3.6.x branch to master
-rw-r--r--php/ext/google/protobuf/package.xml22
1 files changed, 19 insertions, 3 deletions
diff --git a/php/ext/google/protobuf/package.xml b/php/ext/google/protobuf/package.xml
index 28d713f3..a3bf2752 100644
--- a/php/ext/google/protobuf/package.xml
+++ b/php/ext/google/protobuf/package.xml
@@ -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>
@@ -248,5 +248,21 @@ G A release.
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>
</changelog>
</package>