aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/test_submission
diff options
context:
space:
mode:
authorAditi Mittal <aditi.iitr@gmail.com>2013-09-18 22:23:36 +0530
committerAditi Mittal <aditi.iitr@gmail.com>2013-09-18 22:23:36 +0530
commitbca32cd47401b7f41a5a3c0ca3ddd5940dcd03b1 (patch)
treef6fd09182e86069b1aa4b7bb1721b79885b602f7 /mediagoblin/tests/test_submission
parent4346331c2a8084a4475c7c37e5630b5bf68d8389 (diff)
parent28eab59acef05b5f38052941483f900d2e78c50b (diff)
downloadmediagoblin-bca32cd47401b7f41a5a3c0ca3ddd5940dcd03b1.tar.lz
mediagoblin-bca32cd47401b7f41a5a3c0ca3ddd5940dcd03b1.tar.xz
mediagoblin-bca32cd47401b7f41a5a3c0ca3ddd5940dcd03b1.zip
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/tests/test_submission')
-rw-r--r--mediagoblin/tests/test_submission/COPYING.txt5
-rw-r--r--mediagoblin/tests/test_submission/big.pngbin0 -> 2212445 bytes
-rw-r--r--mediagoblin/tests/test_submission/medium.pngbin0 -> 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
new file mode 100644
index 00000000..a284cfda
--- /dev/null
+++ b/mediagoblin/tests/test_submission/big.png
Binary files differ
diff --git a/mediagoblin/tests/test_submission/medium.png b/mediagoblin/tests/test_submission/medium.png
new file mode 100644
index 00000000..e8b9ca00
--- /dev/null
+++ b/mediagoblin/tests/test_submission/medium.png
Binary files differ