summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-12-11 11:34:50 +0000
committerErik Johnston <erik@matrix.org>2019-12-11 11:34:50 +0000
commitd21577bdcbe9dee569ca820604aef92bdda8a67d (patch)
tree1ade5d4de8470c9cb10d1765af77b5096df72fa3 /changelog.d
parentFixup changelogs (diff)
parentDrop unused index (diff)
downloadsynapse-d21577bdcbe9dee569ca820604aef92bdda8a67d.tar.xz
Merge branch 'erikj/fix_sqlite_7' of github.com:matrix-org/synapse into release-v1.7.0
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/6497.bugfix1
-rw-r--r--changelog.d/6499.bugfix1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/6497.bugfix b/changelog.d/6497.bugfix
new file mode 100644
index 0000000000..92ed08fc40
--- /dev/null
+++ b/changelog.d/6497.bugfix
@@ -0,0 +1 @@
+Fix error message when setting your profile's avatar URL mentioning displaynames, and prevent NoneType avatar_urls.
\ No newline at end of file
diff --git a/changelog.d/6499.bugfix b/changelog.d/6499.bugfix
new file mode 100644
index 0000000000..299feba0f8
--- /dev/null
+++ b/changelog.d/6499.bugfix
@@ -0,0 +1 @@
+Fix support for SQLite 3.7.