Merge commit 'ca2d93f4'

b4504b99 · Tobias Munk · eb6111f6 · ca2d93f4 · b4504b99 · b4504b99
Commit b4504b99 authored Nov 28, 2017 by Tobias Munk
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 201 additions and 134 deletions

README.md README.md +1 -1

json-editor-customizations.md guide/tutorials/json-editor-customizations.md +200 -133

No files found.
--- a/README.md
+++ b/README.md
@@ -31,4 +31,4 @@ phd5

 ---

-### ![dmstr logo](http://t.phundament.com/dmstr-16-cropped.png) Built by [dmstr](http://diemeisterei.de)
+### ![dmstr logo](https://t.phundament.com/dmstr-16-cropped.png) Built by [dmstr](http://diemeisterei.de)
--- a/guide/tutorials/json-editor-customizations.md
+++ b/guide/tutorials/json-editor-customizations.md