aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tools/common.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-03-04 15:47:05 -0600
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-03-04 15:47:05 -0600
commitf415c35b4ec5aebbc46bc6602a90ca29254838d6 (patch)
treead66f33756f393fbeca2e25864a1d969b0c4c8e1 /mediagoblin/tools/common.py
parent99a54c0095ccadcebeb640cb20cb6eadb8b9a39d (diff)
parentf51a416778bc71ec373fac1cbfbf7df60815b68d (diff)
downloadmediagoblin-f415c35b4ec5aebbc46bc6602a90ca29254838d6.tar.lz
mediagoblin-f415c35b4ec5aebbc46bc6602a90ca29254838d6.tar.xz
mediagoblin-f415c35b4ec5aebbc46bc6602a90ca29254838d6.zip
Merge branch 'master' into 419_cherrypick_large_uploads
Diffstat (limited to 'mediagoblin/tools/common.py')
-rw-r--r--mediagoblin/tools/common.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/mediagoblin/tools/common.py b/mediagoblin/tools/common.py
index c9f9d032..34586611 100644
--- a/mediagoblin/tools/common.py
+++ b/mediagoblin/tools/common.py
@@ -16,7 +16,6 @@
import sys
-DISPLAY_IMAGE_FETCHING_ORDER = [u'medium', u'original', u'thumb']
global TESTS_ENABLED
TESTS_ENABLED = False