summary refs log tree commit diff
path: root/res/templates
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-09-05 15:01:33 +0100
committerErik Johnston <erik@matrix.org>2016-09-05 15:01:33 +0100
commit9e6d88f4e2761ee6c2785f33085ba1d396b7e1ed (patch)
tree87ea6eaf5acc72908c09f9a249129bc252eae14d /res/templates
parentTake value in a better way (diff)
parentMerge pull request #1070 from matrix-org/erikj/presence_stats (diff)
downloadsynapse-9e6d88f4e2761ee6c2785f33085ba1d396b7e1ed.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage
Diffstat (limited to 'res/templates')
0 files changed, 0 insertions, 0 deletions