diff options
| -rw-r--r-- | CHANGES.md | 16 | ||||
| -rw-r--r-- | changelog.d/4289.feature | 1 | ||||
| -rw-r--r-- | changelog.d/4290.feature | 1 | ||||
| -rw-r--r-- | changelog.d/4291.misc | 1 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
5 files changed, 17 insertions, 4 deletions
diff --git a/CHANGES.md b/CHANGES.md index bd420ba5ef..68210a7d60 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 4d53bd22c3..0000000000 --- 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 df5114bae9..0000000000 --- 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 d3bfe3dd0c..0000000000 --- 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 df0504ac2c..d5f6dc2094 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" |