Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
3e4c975b70
|
@ -9,13 +9,12 @@ can be loaded as CommonJS module, AMD module, or as a regular javascript file.
|
||||||
|
|
||||||
Supported browsers: Chrome, Firefox, Safari, Opera, Internet Explorer 9+.
|
Supported browsers: Chrome, Firefox, Safari, Opera, Internet Explorer 9+.
|
||||||
|
|
||||||
|
<img alt="json editor" src="https://raw.github.com/josdejong/jsoneditor/master/misc/jsoneditor.png"> <img alt="code editor" src="https://raw.github.com/josdejong/jsoneditor/master/misc/codeeditor.png">
|
||||||
|
|
||||||
Cross browser testing for JSONEditor is generously provided by <a href="https://www.browserstack.com" target="_blank">BrowserStack</a>
|
Cross browser testing for JSONEditor is generously provided by <a href="https://www.browserstack.com" target="_blank">BrowserStack</a>
|
||||||
|
|
||||||
<a href="https://www.browserstack.com" target="_blank"><img alt="BrowserStack" src="https://raw.github.com/josdejong/jsoneditor/master/misc/browserstack.png"></a>
|
<a href="https://www.browserstack.com" target="_blank"><img alt="BrowserStack" src="https://raw.github.com/josdejong/jsoneditor/master/misc/browserstack.png"></a>
|
||||||
|
|
||||||
<img alt="json editor" src="https://raw.github.com/josdejong/jsoneditor/master/misc/jsoneditor.png"> <img alt="code editor" src="https://raw.github.com/josdejong/jsoneditor/master/misc/codeeditor.png">
|
|
||||||
|
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
### Tree editor
|
### Tree editor
|
||||||
|
|
Loading…
Reference in New Issue