diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-11-04 16:01:00 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-11-04 16:01:00 +0000 |
| commit | 33b3e0404937452a079be36b1cb7951cc17d221b (patch) | |
| tree | 151b669f040baaaad81b4f79d2ccc619932595c1 /CONTRIBUTING.rst | |
| parent | Remove more unused parameters (diff) | |
| parent | Merge pull request #346 from matrix-org/markjh/remove_lock_manager (diff) | |
| download | synapse-33b3e0404937452a079be36b1cb7951cc17d221b.tar.xz | |
Merge branch 'develop' into daniel/removesomelies
Conflicts: synapse/notifier.py
Diffstat (limited to 'CONTRIBUTING.rst')
0 files changed, 0 insertions, 0 deletions