diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-07 14:34:00 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-07 14:34:00 +0000 |
| commit | bacaa215eb2e1c11e50bbc3fb0e43e28a463458b (patch) | |
| tree | 27510a6358b8bc219ccd456622b963a3b394bee3 /synapse/util/async.py | |
| parent | Merge branch 'hotfixes-v0.6.0a' (diff) | |
| parent | Improve change log (diff) | |
| download | synapse-bacaa215eb2e1c11e50bbc3fb0e43e28a463458b.tar.xz | |
Merge branch 'release-v0.6.1' of github.com:matrix-org/synapse v0.6.1
Diffstat (limited to 'synapse/util/async.py')
| -rw-r--r-- | synapse/util/async.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/async.py b/synapse/util/async.py index 7dd3ec3a72..c4fe5d522f 100644 --- a/synapse/util/async.py +++ b/synapse/util/async.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2014 OpenMarket Ltd +# Copyright 2014, 2015 OpenMarket Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. |