summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavor <vorgrimmlerdavid@gmx.de>2012-08-21 09:24:43 +0200
committerdavor <vorgrimmlerdavid@gmx.de>2012-08-21 09:24:43 +0200
commit1ab1b15bbd51c56373e2749fe3cba1d739aef981 (patch)
treed42b517f2a6382dc4bf93aac4552283412bcb238
parentc4c314a99902b68b544aed0cc1ee6a616fbc78db (diff)
parentb464a5cad8afbc55550144828338f73509a9b162 (diff)
Merge branch 'development' into migration
-rw-r--r--VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/VERSION b/VERSION
index 3eefcb9..8c5ba87 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.0
+5.0.0pre1