diff options
| author | Tim Hatch <tim@timhatch.com> | 2014-04-14 17:18:09 -0400 |
|---|---|---|
| committer | Tim Hatch <tim@timhatch.com> | 2014-04-14 17:18:09 -0400 |
| commit | d5fbe891177b85ada9d54239b1e86be059c63fc9 (patch) | |
| tree | 5a25c483b54a330edb54940a98f5dfa36295d8d1 /tests/test_basic_api.py | |
| parent | 653fafe1d33ceb7c4c0771c113e77926157db192 (diff) | |
| parent | ad810cad22484e52bacc1b065d187c67dd1220bb (diff) | |
| download | pygments-d5fbe891177b85ada9d54239b1e86be059c63fc9.tar.gz | |
Merged in tboyt/pygments-main (pull request #186)
Conflicts:
pygments/lexers/_mapping.py
pygments/lexers/templates.py
Diffstat (limited to 'tests/test_basic_api.py')
0 files changed, 0 insertions, 0 deletions