diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-29 16:18:34 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-29 16:18:34 +0000 |
| commit | 295322048d7dc71ca008d85024cb538eec1e2b1a (patch) | |
| tree | aa780f1ea48cab989d2802673f76b5e7e5aca285 /synapse/rest/__init__.py | |
| parent | Fix code-style (diff) | |
| parent | Code style fixes. (diff) | |
| download | synapse-295322048d7dc71ca008d85024cb538eec1e2b1a.tar.xz | |
Merge branch 'develop' into client_v2_filter
Diffstat (limited to 'synapse/rest/__init__.py')
| -rw-r--r-- | synapse/rest/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py index 90afd93333..1a84d94cd9 100644 --- a/synapse/rest/__init__.py +++ b/synapse/rest/__init__.py @@ -11,4 +11,4 @@ # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and -# limitations under the License. \ No newline at end of file +# limitations under the License. |