summary refs log tree commit diff
path: root/synapse/static
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-06-10 18:33:55 +0100
committerErik Johnston <erik@matrix.org>2019-06-10 18:33:55 +0100
commitabce00fc6a722884d68aa56081b0e86a3c667b00 (patch)
tree8a116e98cc94acb1e0393f0ecd8d63ca2c6893f7 /synapse/static
parentMerge pull request #5415 from matrix-org/erikj/fix_null_valid_until_ms (diff)
parent1.0.0rc2 (diff)
downloadsynapse-abce00fc6a722884d68aa56081b0e86a3c667b00.tar.xz
Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/static')
0 files changed, 0 insertions, 0 deletions