diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-09-18 11:21:57 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-09-18 11:21:57 -0500 |
| commit | 28eab59acef05b5f38052941483f900d2e78c50b (patch) | |
| tree | 67cfcdc247bdd856cd72798ee2492bdbafd31e47 /mediagoblin/tests/resources.py | |
| parent | 81e536e1a27626d5386b917cb1405eb1585e4f10 (diff) | |
| parent | 0b95003cd4055745494cf10c89ccbfa6ac04c0e4 (diff) | |
| download | mediagoblin-28eab59acef05b5f38052941483f900d2e78c50b.tar.lz mediagoblin-28eab59acef05b5f38052941483f900d2e78c50b.tar.xz mediagoblin-28eab59acef05b5f38052941483f900d2e78c50b.zip | |
Merge remote-tracking branch 'refs/remotes/rodney757/file_limits'
Conflicts:
mediagoblin/db/migrations.py
Diffstat (limited to 'mediagoblin/tests/resources.py')
| -rw-r--r-- | mediagoblin/tests/resources.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mediagoblin/tests/resources.py b/mediagoblin/tests/resources.py index f7b3037d..480f6d9a 100644 --- a/mediagoblin/tests/resources.py +++ b/mediagoblin/tests/resources.py @@ -29,6 +29,8 @@ EVIL_JPG = resource('evil.jpg') EVIL_PNG = resource('evil.png') BIG_BLUE = resource('bigblue.png') GOOD_PDF = resource('good.pdf') +MED_PNG = resource('medium.png') +BIG_PNG = resource('big.png') def resource_exif(f): |