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

..

ContentTypes/Markdown

Finalize table of contents feature, also for confluence upload

2016-04-14 12:02:31 +02:00

Api.php

Merge branch 'master' into development

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

ContentPage.php

Add the ability to put an information message at the top of a confluence page

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

DuplicateTitleException.php

Stop publishing on duplicate page

2016-01-25 14:47:37 +01:00

Generator.php

Code Style

2015-08-04 22:29:26 +02:00

Publisher.php

Small tweaks

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