diff options
| author | David Baker <dave@matrix.org> | 2015-01-27 15:58:27 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-01-27 15:58:27 +0000 |
| commit | 1d779691248be2fcdd43e97352d13c2cef239c10 (patch) | |
| tree | 0b6b40aec503ca42f77b968c6d84b204edefeb48 /synapse/api | |
| parent | Support membership events and more camelcase/underscores (diff) | |
| download | synapse-1d779691248be2fcdd43e97352d13c2cef239c10.tar.xz | |
Unbreak bad presence merge - don't add these blocks together with an and: they're different things.
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions