summary refs log tree commit diff
path: root/webclient/settings
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-18 14:52:19 +0100
committerErik Johnston <erik@matrix.org>2014-09-18 14:52:19 +0100
commit79a5fb469b58ea0561a917117cd471d6cd8761df (patch)
tree2cdfba70dd998a6fae20af8cfee440f809ce357c /webclient/settings
parentMerge branch 'test-sqlite-memory' of github.com:matrix-org/synapse into develop (diff)
parentBump changelog and versions (diff)
downloadsynapse-79a5fb469b58ea0561a917117cd471d6cd8761df.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'webclient/settings')
0 files changed, 0 insertions, 0 deletions