Merge remote-tracking branch 'origin/master'

This commit is contained in:
jos 2015-01-25 15:12:20 +01:00
commit 63e61dd817
1 changed files with 1 additions and 1 deletions

View File

@ -74,7 +74,7 @@ download:
<html>
<head>
<link rel="stylesheet" type="text/css" href="jsoneditor/jsoneditor.min.css">
<script type="text/javascript" src="jsoneditor/jsoneditor-min.js"></script>
<script type="text/javascript" src="jsoneditor/jsoneditor.min.js"></script>
</head>
<body>
<div id="jsoneditor" style="width: 400px; height: 400px;"></div>