Stéphane Goetz a2f5d89201 Merge branch 'master' into development ... * master: Adjust API to work with Guzzle 6 Change guzzle version to ~6.0 Added docs to explain how to use markdown to display images # Conflicts: # composer.lock		2016-04-14 21:28:52 +02:00
..
Auto_Syntax_Highlight.md	Big documentation improvements	2015-12-12 00:22:43 +01:00
GitHub_Flavored_Markdown.md	Added docs to explain how to use markdown to display images	2016-04-08 14:45:12 +02:00
Internal_links.md	Big documentation improvements	2015-12-12 00:22:43 +01:00
Landing_page.md	Add a way to disable the automatic landing page	2016-01-07 21:18:18 +01:00
Live_mode.md	Big documentation improvements	2015-12-12 00:22:43 +01:00
Multilanguage.md	Big documentation improvements	2015-12-12 00:22:43 +01:00
Multiple_Output_Formats.md	Big documentation improvements	2015-12-12 00:22:43 +01:00
Navigation_and_Sorting.md	Big documentation improvements	2015-12-12 00:22:43 +01:00
Search.md	Finalize search feature for merge	2016-03-13 21:51:58 +01:00
Static_Site_Generation.md	Big documentation improvements	2015-12-12 00:22:43 +01:00
Table_of_contents.md	Finalize table of contents feature, also for confluence upload	2016-04-14 12:02:31 +02:00
sampleimage.png	Added docs to explain how to use markdown to display images	2016-04-08 14:45:12 +02:00