diff options
author | Erik Johnston <erik@matrix.org> | 2015-08-12 14:28:43 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-08-12 14:28:43 +0100 |
commit | d46208c12cab2971935552a5ceffb8e908b4b03b (patch) | |
tree | 276f70aa8349c40a25a32d8df6f71f3bdbe812c3 /synapse/rest | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary... (diff) | |
parent | Merge pull request #220 from matrix-org/markjh/generate_keys (diff) | |
download | synapse-d46208c12cab2971935552a5ceffb8e908b4b03b.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache
Diffstat (limited to 'synapse/rest')
0 files changed, 0 insertions, 0 deletions