aboutsummaryrefslogtreecommitdiffstats
path: root/tests/extensions/test.cfg
diff options
context:
space:
mode:
authorWaylan Limberg <waylan@gmail.com>2012-01-18 21:29:19 -0500
committerWaylan Limberg <waylan@gmail.com>2012-01-18 21:29:19 -0500
commitc33dbafc2663e2d495c53ab0bf26f5f6c4087863 (patch)
treea00f8f59e2774438cf66125b362016a19ad1393e /tests/extensions/test.cfg
parent77c587e1d16934608fc91aa34894836ef0d03a8b (diff)
parent69b365d07c7fabb206d9094398de2162cbcf6ba3 (diff)
downloadmarkdown-c33dbafc2663e2d495c53ab0bf26f5f6c4087863.tar.gz
markdown-c33dbafc2663e2d495c53ab0bf26f5f6c4087863.tar.bz2
markdown-c33dbafc2663e2d495c53ab0bf26f5f6c4087863.zip
Merge branch 'master' of git://github.com/fiesta/Python-Markdown into fiesta
Conflicts: markdown/inlinepatterns.py
Diffstat (limited to 'tests/extensions/test.cfg')
-rw-r--r--tests/extensions/test.cfg6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/extensions/test.cfg b/tests/extensions/test.cfg
index c25bdfb..ebe9a8f 100644
--- a/tests/extensions/test.cfg
+++ b/tests/extensions/test.cfg
@@ -20,3 +20,9 @@ extensions=toc
[wikilinks]
extensions=wikilinks
+
+[fenced_code]
+extensions=fenced_code
+
+[github_flavored]
+extensions=codehilite,fenced_code