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
..
2016-04-12 08:38:52 +02:00
2015-07-20 20:49:09 +02:00
2015-07-20 20:49:09 +02:00