diff options
| author | David Baker <dave@matrix.org> | 2015-03-04 15:24:21 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-03-04 15:24:21 +0000 |
| commit | ed72fc3a503d292f6ca6b1b6e636278c8e2565e4 (patch) | |
| tree | f10f4575f423735c290c220b078db746ec151608 /synapse/config | |
| parent | Merge branch 'develop' into pushrules2 (diff) | |
| parent | Merge pull request #99 from matrix-org/schema_versioning (diff) | |
| download | synapse-ed72fc3a503d292f6ca6b1b6e636278c8e2565e4.tar.xz | |
Merge branch 'develop' into pushrules2
Conflicts: synapse/storage/schema/pusher.sql
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions