diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-01-29 16:18:59 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-01-29 16:18:59 +0000 |
commit | 8e571cbed8c1eccea169589362fa977406f594a6 (patch) | |
tree | 4723970b6cf46305c1db16145d05acc026fea3e7 /synapse/rest/__init__.py | |
parent | Merge branch 'client_v2_filter' into client_v2_sync (diff) | |
parent | Merge branch 'develop' into client_v2_filter (diff) | |
download | synapse-8e571cbed8c1eccea169589362fa977406f594a6.tar.xz |
Merge branch 'client_v2_filter' into client_v2_sync
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. |