diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-19 15:02:47 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-19 15:02:47 +0100 |
| commit | 22dd0b37c4215a001e801ebe4bdfa36153ea1324 (patch) | |
| tree | 6d470f79a53f2cff682c80eaca094c9d1f737661 /synapse | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor (diff) | |
| download | synapse-22dd0b37c4215a001e801ebe4bdfa36153ea1324.tar.xz | |
Fix typo in merge conflict
Diffstat (limited to 'synapse')
0 files changed, 0 insertions, 0 deletions