Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:matrix-org/synapse into develop

This commit is contained in:
Erik Johnston 2014-09-18 16:22:14 +01:00
parent d583aaa0c3 380852b58e
commit e0f060d89b
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGES.rst
View File

@ -1,3 +1,10 @@
Changes in synapse 0.3.2 (2014-09-18)
=====================================
Webclient:
* Fix bug where an empty "bing words" list in old accounts didn't send
notifications when it should have done.
Changes in synapse 0.3.1 (2014-09-18)
=====================================
This is a release to hotfix v0.3.0 to fix two regressions.

2
VERSION
View File

@ -1 +1 @@
0.3.1
0.3.2

2
synapse/__init__.py
View File

@ -16,4 +16,4 @@
""" This is a reference implementation of a synapse home server.
"""
__version__ = "0.3.1"
__version__ = "0.3.2"

2
webclient/components/matrix/event-handler-service.js
View File

@ -189,7 +189,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
// always bing if there are 0 bing words... apparently.
var bingWords = matrixService.config().bingWords;
if (bingWords && bingWords.length === 0) {
if (bingWords === undefined || bingWords.length === 0) {
shouldBing = true;
}