Commit Graph

2 Commits

Author SHA1 Message Date
jos 482b9a74a2 Cleanup comments and update number of example 2018-08-13 20:53:32 +02:00
jos 13bb4d7bb1 Merge branch 'extendEvent' of https://github.com/cristinabarrantes/jsoneditor into cristinabarrantes-extendEvent
# Conflicts:
#	package.json
#	src/js/JSONEditor.js
2018-08-13 20:53:03 +02:00