diff options
| author | David Baker <dave@matrix.org> | 2016-01-04 13:39:51 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-01-04 13:39:51 +0000 |
| commit | 928c575c6f0920810751957dcf0a7bfdd5d855f2 (patch) | |
| tree | 05addd9237604902e9450f5e3583fd9cbe268276 /synapse/__init__.py | |
| parent | Address minor PR issues (diff) | |
| parent | Update CHANGES (diff) | |
| download | synapse-928c575c6f0920810751957dcf0a7bfdd5d855f2.tar.xz | |
Merge remote-tracking branch 'origin/develop' into store_event_actions
Diffstat (limited to 'synapse/__init__.py')
| -rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py |