diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-28 17:29:30 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-28 17:29:30 +0000 |
| commit | 9c61556504924a063e7739ba80122c8753aed50c (patch) | |
| tree | a483e292dfe602f30be1f9f17266a1bd0f88552d /synapse/rest/__init__.py | |
| parent | Fix Formatting (diff) | |
| parent | Merge pull request #36 from matrix-org/device_id_from_access_token (diff) | |
| download | synapse-9c61556504924a063e7739ba80122c8753aed50c.tar.xz | |
Merge branch 'develop' 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 1a84d94cd9..90afd93333 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. +# limitations under the License. \ No newline at end of file |