diff --git a/CHANGES.md b/CHANGES.md index bd420ba5ef6d74852890c1207df5b3e8bc5c7e0a..68210a7d607e2168ade01c30e1ac6c9449c1e8d3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,19 @@ +Synapse 0.34.0rc2 (2018-12-11) +============================== + +Features +-------- + +- Add a welcome page for the client API port. Credit to @krombel! ([\#4289](https://github.com/matrix-org/synapse/issues/4289)) +- Remove Matrix console from the default distribution ([\#4290](https://github.com/matrix-org/synapse/issues/4290)) + + +Internal Changes +---------------- + +- Disable pager when running git-show in CI ([\#4291](https://github.com/matrix-org/synapse/issues/4291)) + + Synapse 0.34.0rc1 (2018-12-04) ============================== diff --git a/changelog.d/4289.feature b/changelog.d/4289.feature deleted file mode 100644 index 4d53bd22c38cb9fdf331aab138a11ef17ffa43c9..0000000000000000000000000000000000000000 --- a/changelog.d/4289.feature +++ /dev/null @@ -1 +0,0 @@ -Add a welcome page for the client API port. Credit to @krombel! \ No newline at end of file diff --git a/changelog.d/4290.feature b/changelog.d/4290.feature deleted file mode 100644 index df5114bae91bbebdaaa172e6b4b0e8e7c8da3267..0000000000000000000000000000000000000000 --- a/changelog.d/4290.feature +++ /dev/null @@ -1 +0,0 @@ -Remove Matrix console from the default distribution diff --git a/changelog.d/4291.misc b/changelog.d/4291.misc deleted file mode 100644 index d3bfe3dd0c1c0b9c799efbbae0cbab9171f8697e..0000000000000000000000000000000000000000 --- a/changelog.d/4291.misc +++ /dev/null @@ -1 +0,0 @@ -Disable pager when running git-show in CI \ No newline at end of file diff --git a/synapse/__init__.py b/synapse/__init__.py index df0504ac2c1f8aef49ede8f8b0cb3ee061a31844..d5f6dc209456f31a34eccb690582c563947b68ee 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -27,4 +27,4 @@ try: except ImportError: pass -__version__ = "0.34.0rc1" +__version__ = "0.34.0rc2"