diff options
author | Tim Hatch <tim@timhatch.com> | 2014-04-14 20:06:52 -0400 |
---|---|---|
committer | Tim Hatch <tim@timhatch.com> | 2014-04-14 20:06:52 -0400 |
commit | d85343792ab32ad0b737bfc17208d7239863e73a (patch) | |
tree | 2738106f6df64e1b9a47e743f628925d91e2c1eb /tests/test_basic_api.py | |
parent | d5fbe891177b85ada9d54239b1e86be059c63fc9 (diff) | |
parent | 0b35f5ffa1ea7e40bf835b65057ce28abb1446ce (diff) | |
download | pygments-d85343792ab32ad0b737bfc17208d7239863e73a.tar.gz |
Merged in kwadrat/pygments-main (pull request #319)
Conflicts:
pygments/lexers/other.py
Diffstat (limited to 'tests/test_basic_api.py')
0 files changed, 0 insertions, 0 deletions