diff options
| author | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-09-12 18:58:04 -0400 |
|---|---|---|
| committer | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-09-12 18:58:04 -0400 |
| commit | 045fe0ee9d43aa825de6fbf14fe8fd48953d4eff (patch) | |
| tree | e0743c13e20845a613ba8e4064cb1e0f10f54025 /mediagoblin/_version.py | |
| parent | a02831687a6026b2baa0f971ecb3e594c3f415e2 (diff) | |
| parent | 66cafc3b74d476710013efb46341b989028f3057 (diff) | |
| download | mediagoblin-045fe0ee9d43aa825de6fbf14fe8fd48953d4eff.tar.lz mediagoblin-045fe0ee9d43aa825de6fbf14fe8fd48953d4eff.tar.xz mediagoblin-045fe0ee9d43aa825de6fbf14fe8fd48953d4eff.zip | |
Merge branch 'master' into OPW-Moderation-Update
Conflicts:
mediagoblin/db/migrations.py
Diffstat (limited to 'mediagoblin/_version.py')
| -rw-r--r-- | mediagoblin/_version.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/_version.py b/mediagoblin/_version.py index 94629775..3594c909 100644 --- a/mediagoblin/_version.py +++ b/mediagoblin/_version.py @@ -23,4 +23,4 @@ # see http://www.python.org/dev/peps/pep-0386/ -__version__ = "0.5.0.dev" +__version__ = "0.6.0.dev" |