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

..

Base

Add getPureContent to Page to be able to get content without template

2016-03-13 21:51:15 +01:00

Confluence

Merge branch 'master' into development

2016-04-14 21:28:52 +02:00

HTML

Small tweaks

2016-04-14 12:03:46 +02:00

HTMLFile

Create single-page HTML output, prepares the terrain for PDF/ePub output

2015-11-06 22:44:34 +01:00