diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-07-10 17:40:57 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-07-10 17:40:57 -0500 |
| commit | 2ae78574b3eb8c393136e7ebbc922d33bf6482f2 (patch) | |
| tree | 3c7bccb010600319c5f34ddf41aa31620de8e951 /mediagoblin/_version.py | |
| parent | 5622cc44edfb2d653ae67946fa9ea130c5f7fcaa (diff) | |
| parent | d3b1fd2e606f549c5ecc2a31c94d90aa93794005 (diff) | |
| download | mediagoblin-2ae78574b3eb8c393136e7ebbc922d33bf6482f2.tar.lz mediagoblin-2ae78574b3eb8c393136e7ebbc922d33bf6482f2.tar.xz mediagoblin-2ae78574b3eb8c393136e7ebbc922d33bf6482f2.zip | |
Merge branch 'release-0.4.1'
Conflicts:
mediagoblin/_version.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 2abc105f..94629775 100644 --- a/mediagoblin/_version.py +++ b/mediagoblin/_version.py @@ -23,4 +23,4 @@ # see http://www.python.org/dev/peps/pep-0386/ -__version__ = "0.4.1.dev" +__version__ = "0.5.0.dev" |