diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-06 19:48:53 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-06 19:48:53 +0000 |
| commit | 5cf45c43190321b3ee6df4198df815da29dac90f (patch) | |
| tree | 9841d49b0964de4046c0835ddcc976a25c2c8137 /VERSION | |
| parent | Use time.time() instead of time.clock() (diff) | |
| parent | Merge branch 'hotfixes-v0.6.0a' (diff) | |
| download | synapse-5cf45c43190321b3ee6df4198df815da29dac90f.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions