diff options
| author | Kevin Carrogan <kevin.carrogan@gmail.com> | 2014-05-09 21:02:54 +0100 |
|---|---|---|
| committer | Kevin Carrogan <kevin.carrogan@gmail.com> | 2014-05-09 21:02:54 +0100 |
| commit | 3a780b6f0151cd4dcd25bd81153147957b999249 (patch) | |
| tree | 50843ba54c8d2121af24c799152ed8f6759eb142 /HISTORY.md | |
| parent | 856925f3ca4de6ca5a709aa8f3cd10a4962573a3 (diff) | |
| parent | 26f201e7271565a3f414bcf53252a82ed06ce833 (diff) | |
| download | pystache-3a780b6f0151cd4dcd25bd81153147957b999249.tar.gz | |
Merge branch 'master' into development
Conflicts:
pystache/__init__.py
setup.py
Diffstat (limited to 'HISTORY.md')
0 files changed, 0 insertions, 0 deletions