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 /.travis.yml | |
| parent | 3a780b6f0151cd4dcd25bd81153147957b999249 (diff) | |
| parent | f9ca07a976696031ae0d98bb067e0cf692bd6c49 (diff) | |
| download | pystache-3ab8acc44421655ee73e55aa469271a456e97f84.tar.gz | |
Merge branch 'master' into development
Conflicts:
HISTORY.md
setup_description.rst
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions