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/test_submission | |
| 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/test_submission')
| -rw-r--r-- | mediagoblin/tests/test_submission/COPYING.txt | 5 | ||||
| -rw-r--r-- | mediagoblin/tests/test_submission/big.png | bin | 0 -> 2212445 bytes | |||
| -rw-r--r-- | mediagoblin/tests/test_submission/medium.png | bin | 0 -> 1796336 bytes |
3 files changed, 5 insertions, 0 deletions
diff --git a/mediagoblin/tests/test_submission/COPYING.txt b/mediagoblin/tests/test_submission/COPYING.txt new file mode 100644 index 00000000..3818aae4 --- /dev/null +++ b/mediagoblin/tests/test_submission/COPYING.txt @@ -0,0 +1,5 @@ +Images located in this directory tree are released under a GPLv3 license +and CC BY-SA 3.0 license. To the extent possible under law, the author(s) +have dedicated all copyright and related and neighboring rights to these +files to the public domain worldwide. These files are distributed without +any warranty. diff --git a/mediagoblin/tests/test_submission/big.png b/mediagoblin/tests/test_submission/big.png Binary files differnew file mode 100644 index 00000000..a284cfda --- /dev/null +++ b/mediagoblin/tests/test_submission/big.png diff --git a/mediagoblin/tests/test_submission/medium.png b/mediagoblin/tests/test_submission/medium.png Binary files differnew file mode 100644 index 00000000..e8b9ca00 --- /dev/null +++ b/mediagoblin/tests/test_submission/medium.png |
