diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-03-16 10:09:15 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-03-16 10:09:15 +0000 |
| commit | f9232c7917322de392921336b4bab5d85c213c4e (patch) | |
| tree | ab55547f1c895da508e6ac37c8056fef5b3b754e /CHANGES.rst | |
| parent | Fix remaining scheduler bugs. Add more informative logging. (diff) | |
| parent | add ToC and fix typoe (diff) | |
| download | synapse-f9232c7917322de392921336b4bab5d85c213c4e.tar.xz | |
Merge branch 'develop' into application-services-txn-reliability
Conflicts: synapse/storage/appservice.py
Diffstat (limited to 'CHANGES.rst')
| -rw-r--r-- | CHANGES.rst | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 277e24416c..f89542a2bb 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -13,7 +13,6 @@ General: * Notify when invited to a new room. * Notify for messages that don't match any rule. * Notify on incoming call. - * Notify if there were no matching rules. Federation: |