aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/_version.py
diff options
context:
space:
mode:
authorAaron Williamson <aaron@copiesofcopies.org>2012-01-17 00:59:21 -0500
committerAaron Williamson <aaron@copiesofcopies.org>2012-01-17 00:59:21 -0500
commit99a270e95298b248a77b07203ab3921078bd7906 (patch)
tree34711abf27ab7a614c92842b456bf74ec3d5d5fb /mediagoblin/_version.py
parent25b48323a86a1036112f2f33c889d5d12d5dee9c (diff)
parent8c7701f9f1653cf4038143cfb7a497ae21edf108 (diff)
downloadmediagoblin-99a270e95298b248a77b07203ab3921078bd7906.tar.lz
mediagoblin-99a270e95298b248a77b07203ab3921078bd7906.tar.xz
mediagoblin-99a270e95298b248a77b07203ab3921078bd7906.zip
Merged changes with upstream
Diffstat (limited to 'mediagoblin/_version.py')
-rw-r--r--mediagoblin/_version.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/mediagoblin/_version.py b/mediagoblin/_version.py
index df212faf..5e69f21a 100644
--- a/mediagoblin/_version.py
+++ b/mediagoblin/_version.py
@@ -14,4 +14,13 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-__version__ = "0.0.5"
+# valid version formats:
+# * x.y - final release
+# * x.ya1 - alpha 1
+# * x.yb1 - beta 1
+# * x.yrc1 - release candidate 1
+# * x.y.dev - dev
+
+# see http://www.python.org/dev/peps/pep-0386/
+
+__version__ = "0.3.0.dev"