Stéphane Goetz f8806b18b7 Merge branch 'master' of https://github.com/eteeselink/daux.io into development ... * 'master' of https://github.com/eteeselink/daux.io: Add support for anchors on internal links # Conflicts: # libs/ContentTypes/Markdown/LinkRenderer.php		2016-09-21 21:49:55 +02:00
..
Markdown	Merge branch 'master' of https://github.com/eteeselink/daux.io into development	2016-09-21 21:49:55 +02:00