diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-03-13 21:52:56 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-03-13 21:52:56 -0700 |
| commit | a8ad23e61a25d4efaae938ed51228104b6096b14 (patch) | |
| tree | 15cedf2fc26ac8d76747b1522ce604e8075e091b /sites | |
| parent | b94af130b590692c6cdc3312d3ff768e80ab077e (diff) | |
| parent | 9ad2dec32a7cd9ba6c11969725e9512084d77e4a (diff) | |
Merge branch '1.11' into 1.12
Conflicts:
sites/www/changelog.rst
Diffstat (limited to 'sites')
| -rw-r--r-- | sites/www/changelog.rst | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 720d93af..eaf74441 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,9 @@ Changelog ========= +* :bug:`235` Improve string type testing in a handful of spots (e.g. ``s/if + type(x) is str/if isinstance(x, basestring)/g``.) Thanks to ``@ksamuel`` for + the report. * :release:`1.12.3 <2014-03-13>` * :release:`1.11.5 <2014-03-13>` * :release:`1.10.7 <2014-03-13>` |