Skip to content

Commit

Permalink
Released version 3.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
josdejong committed Jan 25, 2015
1 parent 3f6f5d2 commit 376fc27
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
https://github.com/josdejong/jsoneditor


## not yet released, version 3.2.0
## 2015-01-25, version 3.2.0

- Implemented shortcut keys `Ctrl+\` to format and `Ctrl+Shift+\` to compact
JSON when in mode `text` or `code`.
Expand Down
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
JSON Editor
https://github.com/josdejong/jsoneditor

Copyright (C) 2011-2014 Jos de Jong
Copyright (C) 2011-2015 Jos de Jong


Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jsoneditor",
"version": "3.1.3-SNAPSHOT",
"version": "3.2.0",
"description": "A web-based tool to view, edit and format JSON",
"tags": [
"json",
Expand All @@ -15,7 +15,7 @@
},
"main": [
"jsoneditor.min.js",
"jsoneditor.css"
"jsoneditor.min.css"
],
"bugs": "https://github.com/josdejong/jsoneditor/issues",
"ignore": [
Expand Down
4 changes: 2 additions & 2 deletions jsoneditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
* License for the specific language governing permissions and limitations under
* the License.
*
* Copyright (c) 2011-2014 Jos de Jong, http://jsoneditoronline.org
* Copyright (c) 2011-2015 Jos de Jong, http://jsoneditoronline.org
*
* @author Jos de Jong, <[email protected]>
* @version 3.1.3-SNAPSHOT
* @version 3.2.0
* @date 2015-01-25
*/
(function webpackUniversalModuleDefinition(root, factory) {
Expand Down
4 changes: 2 additions & 2 deletions jsoneditor.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jsoneditor",
"version": "3.1.3-SNAPSHOT",
"version": "3.2.0",
"main": "jsoneditor.js",
"description": "A web-based tool to view, edit and format JSON",
"tags": [
Expand Down
2 changes: 1 addition & 1 deletion src/js/header.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*
* Copyright (c) 2011-2014 Jos de Jong, http://jsoneditoronline.org
* Copyright (c) 2011-2015 Jos de Jong, http://jsoneditoronline.org
*
* @author Jos de Jong, <[email protected]>
* @version @@version
Expand Down

0 comments on commit 376fc27

Please sign in to comment.