diff options
author | Tim Hatch <tim@timhatch.com> | 2014-04-14 15:24:11 -0400 |
---|---|---|
committer | Tim Hatch <tim@timhatch.com> | 2014-04-14 15:24:11 -0400 |
commit | 775708f0cd0fc79c120efff55becfc9c0d52aab3 (patch) | |
tree | a3b2610df30e95695abfb4ef8d5728861dbe90c3 /external/moin-parser.py | |
parent | 4ea98ad140a53922d83be5c1ab298e4ca2e980cc (diff) | |
parent | dd4dc914d46c58843c5144aaad6f85bc78ed1973 (diff) | |
download | pygments-775708f0cd0fc79c120efff55becfc9c0d52aab3.tar.gz |
Merged in alexsdutton/pygments-main (pull request #78)
Conflicts:
AUTHORS
pygments/lexers/_mapping.py
Diffstat (limited to 'external/moin-parser.py')
-rw-r--r-- | external/moin-parser.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/moin-parser.py b/external/moin-parser.py index 0bb9791c..41131185 100644 --- a/external/moin-parser.py +++ b/external/moin-parser.py @@ -31,7 +31,7 @@ If you do not want to do that and are willing to accept larger HTML output, you can set the INLINESTYLES option below to True. - :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS. + :copyright: Copyright 2006-2014 by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. """ |