diff options
| author | Tiago Serafim <tserafim@gmail.com> | 2013-02-09 16:51:17 -0200 |
|---|---|---|
| committer | Tiago Serafim <tserafim@gmail.com> | 2013-02-09 17:39:12 -0200 |
| commit | 14f43d5a4c91ac13528f4c9eb8c6247fdafb0ea1 (patch) | |
| tree | edcb6d7462d31d66dcc792ed5e84373187b1de14 /tests/extensions/extra/named_markers.txt | |
| parent | 6c15c64df40b9ded3f5dea2e694905222791c1b6 (diff) | |
| parent | 41cc055580d63ffb7eb2bbb6c88e121727d91d06 (diff) | |
| download | markdown-14f43d5a4c91ac13528f4c9eb8c6247fdafb0ea1.tar.gz markdown-14f43d5a4c91ac13528f4c9eb8c6247fdafb0ea1.tar.bz2 markdown-14f43d5a4c91ac13528f4c9eb8c6247fdafb0ea1.zip | |
Merge branch 'master' into admonition
Conflicts:
docs/extensions/index.txt
tests/extensions/test.cfg
Diffstat (limited to 'tests/extensions/extra/named_markers.txt')
0 files changed, 0 insertions, 0 deletions