diff options
| author | Tim Hatch <tim@timhatch.com> | 2014-04-14 13:30:02 -0400 |
|---|---|---|
| committer | Tim Hatch <tim@timhatch.com> | 2014-04-14 13:30:02 -0400 |
| commit | c4cc92dfb4741050cf084f6ad60b14efe05a01a6 (patch) | |
| tree | 5baa0f9383c67b0065772a75e0fa13044f7a1129 /doc | |
| parent | c94ee3502c1b2b474d185247e489949df26f63dd (diff) | |
| parent | c185cdf3bee199db573c436723b366b1803c4980 (diff) | |
| download | pygments-c4cc92dfb4741050cf084f6ad60b14efe05a01a6.tar.gz | |
Merged in hell0w0rd/pygments-main (pull request #287)
Conflicts:
pygments/lexers/web.py
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/languages.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/languages.rst b/doc/languages.rst index 2e79a35e..426a576b 100644 --- a/doc/languages.rst +++ b/doc/languages.rst @@ -82,6 +82,7 @@ Programming languages * Visual Basic.NET * Visual FoxPro * XQuery +* Zephir </ul> Template languages |