* 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
* 'development' of https://github.com/justinwalsh/daux.io:
Add Table Of Contents feature
Compile latest version
Fix floating value read
Improve toggle usability
Generate can fall back to daux.phar, fixes#354
Add an arrow to open sub-trees, fixes#277
Updates
Finalize search feature for merge
Add `getPureContent` to Page to be able to get content without template
Update the list of demos
Fix dynamic website
First checkin of search for static websites
Compile latest version
Add computed raw pages, to create special content at any time
Small tweaks
# By David Hunt
# Via David Hunt
* 'dev_template_refactor' of https://github.com/holodyn/daux.io:
Updated libs to use /templates and /themes/{theme}/templates Renamed /themes/core to /themes/daux Updated /themes/{theme}/less/theme.less to allow for bootstrap overrides Added /themes/daux/less/theme.less to allow daux to function as theme - used daux-navy colors Moved fonts from themes variants into /themes/daux/fonts
Refactored /templates and /resources into a single /themes folder.
# Conflicts:
# libs/Daux.php
Renamed /themes/core to /themes/daux
Updated /themes/{theme}/less/theme.less to allow for bootstrap overrides
Added /themes/daux/less/theme.less to allow daux to function as theme - used daux-navy colors
Moved fonts from themes variants into /themes/daux/fonts