Merge branch 'dev'

davidhalter · Apr 5, 2017 · 5427b02 · 5427b02
2 parents aa2dfa9 + 3cc97f4
commit 5427b02
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,6 +3,17 @@
 Changelog
 ---------
 
+0.10.2 (2017-04-05)
++++++++++++++++++++
+
+- Python Packaging sucks. Some files were not included in 0.10.1.
+
+0.10.1 (2017-04-05)
++++++++++++++++++++
+
+- Fixed a few very annoying bugs.
+- Prepared the parser to be factored out of Jedi.
+
 0.10.0 (2017-02-03)
 +++++++++++++++++++
 

diff --git a/jedi/__init__.py b/jedi/__init__.py
@@ -36,7 +36,7 @@
 good text editor, while still having very good IDE features for Python.
 """
 
-__version__ = '0.10.1'
+__version__ = '0.10.2'
 
 from jedi.api import Script, Interpreter, NotFoundError, set_debug_function
 from jedi.api import preload_module, defined_names, names