diff options
| author | Erik Johnston <erik@matrix.org> | 2016-05-06 15:59:20 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-05-06 15:59:20 +0100 |
| commit | 012cb5416cded6453e676696d74cab871db4aaf8 (patch) | |
| tree | 71f21e4d6d4a6fd4037cfbf0a200667d29f46247 /synapse/config | |
| parent | Delete old pushers (diff) | |
| parent | Merge pull request #767 from matrix-org/erikj/transaction_txn (diff) | |
| download | synapse-012cb5416cded6453e676696d74cab871db4aaf8.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/push_actions_delete
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions