Skip to content

Commit

Permalink
Merge branch 'master' into merge-data-before-check
Browse files Browse the repository at this point in the history
  • Loading branch information
MetcalfeTom committed Sep 19, 2018
2 parents 7827c7f + 6aeca1c commit e42b354
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
11 changes: 9 additions & 2 deletions CHANGELOG.rst
Expand Up @@ -19,12 +19,19 @@ Changed

Removed
-------
- pytest-services since it wasn't used and caused issues on Windows

Fixed
-----

[0.13.3] - 2018-09-28
[0.13.4] - 2018-09-19
^^^^^^^^^^^^^^^^^^^^^

Fixed
-----
- pinned matplotlib to 2.x (not ready for 3.0 yet)
- pytest-services since it wasn't used and caused issues on Windows

[0.13.3] - 2018-08-28
^^^^^^^^^^^^^^^^^^^^^

Added
Expand Down
2 changes: 1 addition & 1 deletion rasa_nlu/version.py
Expand Up @@ -3,4 +3,4 @@
from __future__ import division
from __future__ import absolute_import

__version__ = '0.13.3'
__version__ = '0.13.4'
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -36,7 +36,7 @@
"tqdm",
"requests",
"jsonschema",
"matplotlib",
"matplotlib~=2.0",
"numpy>=1.13",
"simplejson",
"pyyaml",
Expand Down

0 comments on commit e42b354

Please sign in to comment.