summary refs log tree commit diff
path: root/static
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-10 10:56:46 +0100
committerErik Johnston <erik@matrix.org>2015-05-10 10:56:46 +0100
commitd38862a080849488130b1d89f7e547ebb4e4d725 (patch)
treeb299149745a8e0bf9631ae933b94bb7e4de16aa5 /static
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentMerge pull request #145 from matrix-org/hotfixes-v0.9.0-r3 (diff)
downloadsynapse-d38862a080849488130b1d89f7e547ebb4e4d725.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'static')
0 files changed, 0 insertions, 0 deletions