diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-04-24 10:35:49 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-04-24 10:35:49 +0100 |
| commit | eede182df75d0c0b6064af016a06c2758ae217d0 (patch) | |
| tree | 4d4eb13dd3ab020032394f8282c85f4e3c2782e8 /synapse/rest | |
| parent | Move the key related config parser into a separate file (diff) | |
| parent | Copyright notices (diff) | |
| download | synapse-eede182df75d0c0b6064af016a06c2758ae217d0.tar.xz | |
Merge branch 'develop' into key_distribution
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/media/v1/identicon_resource.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/synapse/rest/media/v1/identicon_resource.py b/synapse/rest/media/v1/identicon_resource.py index 912856386a..603859d5d4 100644 --- a/synapse/rest/media/v1/identicon_resource.py +++ b/synapse/rest/media/v1/identicon_resource.py @@ -1,3 +1,17 @@ +# Copyright 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. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# 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. + from pydenticon import Generator from twisted.web.resource import Resource |