diff options
author | Erik Johnston <erik@matrix.org> | 2015-01-07 09:45:42 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-01-07 09:45:42 +0000 |
commit | 6536161e2a5e1d338475921407d7ce3fa07cc45c (patch) | |
tree | 6e24afc0c9f112674e26662e470a178e60c955c4 /VERSION | |
parent | Merge branch 'master' into develop (diff) | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf (diff) | |
download | synapse-6536161e2a5e1d338475921407d7ce3fa07cc45c.tar.xz |
Merge branch 'erikj-perf' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions