diff options
| author | Kevin Carrogan <kevin.carrogan@gmail.com> | 2014-05-12 13:25:00 +0100 |
|---|---|---|
| committer | Kevin Carrogan <kevin.carrogan@gmail.com> | 2014-05-12 13:25:00 +0100 |
| commit | 3ab8acc44421655ee73e55aa469271a456e97f84 (patch) | |
| tree | 1c4c3f660683296c088904ed72d72d271bd90914 | |
| parent | 3a780b6f0151cd4dcd25bd81153147957b999249 (diff) | |
| parent | f9ca07a976696031ae0d98bb067e0cf692bd6c49 (diff) | |
| download | pystache-3ab8acc44421655ee73e55aa469271a456e97f84.tar.gz | |
Merge branch 'master' into development
Conflicts:
HISTORY.md
setup_description.rst
| -rw-r--r-- | HISTORY.md | 5 | ||||
| -rw-r--r-- | setup_description.rst | 5 |
2 files changed, 10 insertions, 0 deletions
@@ -14,6 +14,11 @@ History - Bugfix: fixed a flaky doctest by making `repr()` deterministic for the `Attachable` class in `pystache.tests.common` +0.5.4 (2014-07-11) +------------------ + +- Bugfix: made test with filenames OS agnostic (issue \#162). + 0.5.3 (2012-11-03) ------------------ diff --git a/setup_description.rst b/setup_description.rst index 04addba..4be7aae 100644 --- a/setup_description.rst +++ b/setup_description.rst @@ -330,6 +330,11 @@ History - Bugfix: fixed a flaky doctest by making ``repr()`` deterministic for the ``Attachable`` class in ``pystache.tests.common`` +0.5.4 (2014-07-11) +------------------ + +- Bugfix: made test with filenames OS agnostic (issue #162). + 0.5.3 (2012-11-03) ------------------ |