diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2016-01-05 18:01:29 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2016-01-05 18:01:29 +0000 |
| commit | 29e131df432e264bc955fd4030f950df01c56201 (patch) | |
| tree | 4629f12bbc21258834188131e8ad9f4733ea28ca /synapse/rest/media/v1/thumbnail_resource.py | |
| parent | Merge pull request #464 from matrix-org/erikj/crop_correct (diff) | |
| parent | Allow guests to upgrade their accounts (diff) | |
| download | synapse-29e131df432e264bc955fd4030f950df01c56201.tar.xz | |
Merge pull request #462 from matrix-org/daniel/guestupgrade
Allow guests to upgrade their accounts
Diffstat (limited to 'synapse/rest/media/v1/thumbnail_resource.py')
| -rw-r--r-- | synapse/rest/media/v1/thumbnail_resource.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/thumbnail_resource.py b/synapse/rest/media/v1/thumbnail_resource.py index 8b8fba3dc7..c18160534e 100644 --- a/synapse/rest/media/v1/thumbnail_resource.py +++ b/synapse/rest/media/v1/thumbnail_resource.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2014, 2015 OpenMarket Ltd +# Copyright 2014 - 2016 OpenMarket Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. |