John MacFarlane 2d2e4c9ab2 Merge branch 'master' of https://github.com/rootzlevel/pandoc into rootzlevel-master ...

Conflicts:
	src/Text/Pandoc/Readers/Org.hs

2015-03-28 21:09:38 -07:00

..

Readers

Merge branch 'master' of https://github.com/rootzlevel/pandoc into rootzlevel-master

2015-03-28 21:09:38 -07:00

Writers

Merge branch 'errortype' of https://github.com/mpickering/pandoc into mpickering-errortype

2015-03-28 12:12:48 -07:00

Arbitrary.hs

Added Cite to Arbitrary instance.

2014-04-29 18:32:42 -07:00

Helpers.hs

Use new flexible metadata type.

2013-06-24 20:29:41 -07:00

Old.hs

Update tests

2015-02-18 21:09:07 +00:00

Shared.hs

Shared: Make collapseFilePath OS-agnostic

2014-09-25 12:42:53 +01:00

Walk.hs

HLint: Remove lambdas.

2013-12-19 20:28:53 -05:00