summary refs log tree commit diff
path: root/VERSION
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-06 19:48:53 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-06 19:48:53 +0000
commit5cf45c43190321b3ee6df4198df815da29dac90f (patch)
tree9841d49b0964de4046c0835ddcc976a25c2c8137 /VERSION
parentUse time.time() instead of time.clock() (diff)
parentMerge branch 'hotfixes-v0.6.0a' (diff)
downloadsynapse-5cf45c43190321b3ee6df4198df815da29dac90f.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions