Merge branch '@Martin-P:fix/zend.json.objects.rst' and Close zendfram…

…ework#1358
malukenho · Oct 14, 2014 · 6b1da8a · 6b1da8a
2 parents 5315bdc + 0a78af5
commit 6b1da8a
Show file tree

Hide file tree

Showing 24 changed files with 4,973 additions and 60 deletions.
diff --git a/docs/languages/en/conf.py b/docs/languages/en/conf.py
@@ -50,7 +50,7 @@
 # The short X.Y version.
 version = '2.3'
 # The full version, including alpha/beta/rc tags.
-release = '2.3.3dev'
+release = '2.3.4dev'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.