Merge branch 'master' of github.com:matrix-org/synapse into develop

This commit is contained in:
Erik Johnston 2015-05-07 19:21:00 +01:00
commit db0dca2f6f
5 changed files with 87 additions and 8 deletions

View file

@ -33,7 +33,7 @@ REQUIREMENTS = {
}
CONDITIONAL_REQUIREMENTS = {
"web_client": {
"matrix_angular_sdk>=0.6.5": ["syweb>=0.6.5"],
"matrix_angular_sdk>=0.6.6": ["syweb>=0.6.6"],
}
}
@ -57,8 +57,8 @@ DEPENDENCY_LINKS = [
),
github_link(
project="matrix-org/matrix-angular-sdk",
version="v0.6.5",
egg="matrix_angular_sdk-0.6.5",
version="v0.6.6",
egg="matrix_angular_sdk-0.6.6",
),
]