Merge branch '0.17-bugfix'

ikanobori · ikanobori · commit 0870a5c8eb0a · 2018-02-13T20:33:01.000Z
diff --git a/CHANGELOG b/CHANGELOG
@@ -5,10 +5,18 @@ Changelog
 ----
 
 New features:
+* #713 expose globals in bpdb debugging.
+  Thanks to toejough.
 
 
 Fixes:
 
+0.17.1
+------
+
+Fixes:
+* Reverted #670 temporarily due to performance impact
+  on large strings being output.
 
 0.17
 ----
diff --git a/README.rst b/README.rst
@@ -1,6 +1,6 @@
 |ImageLink|_
 
-.. |ImageLink| image:: https://travis-ci.org/bpython/bpython.svg?branch=master
+.. |ImageLink| image:: https://travis-ci.org/bpython/bpython.svg?branch=bugfix-0.17
 .. _ImageLink: https://travis-ci.org/bpython/bpython
 
 ***********************************************************************
