aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/_version.py
diff options
context:
space:
mode:
authorBrett Smith <brettcsmith@brettcsmith.org>2012-03-26 14:10:22 -0400
committerBrett Smith <brettcsmith@brettcsmith.org>2012-03-26 14:10:22 -0400
commitc16b8196631e5b1c4cbe618a9af74f5455fe861c (patch)
tree5a94548275636849dd8c771de6b5fe854c0f2098 /mediagoblin/_version.py
parent28f364bd6d488955952aebe86033e5ba148da2fb (diff)
parent7ccf41818581743c2e16935cd7308ad3d6694149 (diff)
downloadmediagoblin-c16b8196631e5b1c4cbe618a9af74f5455fe861c.tar.lz
mediagoblin-c16b8196631e5b1c4cbe618a9af74f5455fe861c.tar.xz
mediagoblin-c16b8196631e5b1c4cbe618a9af74f5455fe861c.zip
Merge remote branch 'origin/master' into bug261-resized-filenames
This merge involved moving the new FilenameBuilder class to processing/__init__.py, and putting the comment deletion tests back into test_submission.py using the refactored functions.
Diffstat (limited to 'mediagoblin/_version.py')
-rw-r--r--mediagoblin/_version.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/_version.py b/mediagoblin/_version.py
index 381d1270..fc1a0f6e 100644
--- a/mediagoblin/_version.py
+++ b/mediagoblin/_version.py
@@ -23,4 +23,4 @@
# see http://www.python.org/dev/peps/pep-0386/
-__version__ = "0.3.0-dev"
+__version__ = "0.3.0.dev"