summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-08-19 15:19:37 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-08-19 15:19:37 +0100
commitecc59ae66ef8e0b491a3ade89f363238abccaab8 (patch)
tree0a8f6b85ccbc42a7e02b9995ee58f13181fe240a /synapse/config
parentRe-add whitespace around caveat operators (diff)
parenthacky support for video for FS CC DD (diff)
downloadsynapse-ecc59ae66ef8e0b491a3ade89f363238abccaab8.tar.xz
Merge branch 'master' into auth
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions