summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-03-03 14:50:36 +0000
committerErik Johnston <erik@matrix.org>2015-03-03 14:50:36 +0000
commitabbee6b29be80a77e05730707602f3bbfc3f38cb (patch)
treeb7c5f5949a76017236595618bb5dceac6b2775a9
parentMerge pull request #97 from matrix-org/hotfixes-v0.7.1-r3 (diff)
parentBump version (diff)
downloadsynapse-abbee6b29be80a77e05730707602f3bbfc3f38cb.tar.xz
Merge pull request #98 from matrix-org/hotfixes-v0.7.1-r4 v0.7.1-r4
Hotfixes v0.7.1 r4
-rw-r--r--synapse/__init__.py2
-rw-r--r--synapse/python_dependencies.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index f78a67454d..74c5584a1a 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.7.1-r3"
+__version__ = "0.7.1-r4"
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index 1195f2cd06..5fe8a825e3 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -36,8 +36,8 @@ DEPENDENCY_LINKS = [
     ),
     github_link(
         project="matrix-org/matrix-angular-sdk",
-        version="v0.6.3",
-        egg="matrix_angular_sdk-0.6.3",
+        version="v0.6.4",
+        egg="matrix_angular_sdk-0.6.4",
     ),
 ]