Eric Lippmann 160a75403d Merge branch 'master' into feature/display-documentation-4820 ...

Conflicts:
	modules/doc/library/Doc/DocParser.php

2014-06-06 14:25:13 +02:00

..

DocController.php

doc: Fix actions and view scripts DocParser usage

2014-06-06 14:12:32 +02:00

DocException.php

modules/doc: Remove module/view.phtml as it has been replaced by renderDocAndToc()

2014-05-27 15:11:33 +02:00

DocIterator.php

doc: Implement DocParser::getChapter()

2014-06-06 14:12:30 +02:00

DocParser.php

Merge branch 'master' into feature/display-documentation-4820

2014-06-06 14:25:13 +02:00

MarkdownFileIterator.php

doc: Don't use absolute 'use' in MarkdownFileIterator

2014-06-06 14:12:27 +02:00