From 309e8f9bc287ac41aeb9899e29b94dffc18cc501 Mon Sep 17 00:00:00 2001 From: jos Date: Mon, 11 Apr 2016 21:42:38 +0200 Subject: [PATCH] Updated history and bootstrap test file --- HISTORY.md | 6 ++++-- test/test_bootstrap.html | 6 ++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 4372b90..b53ec54 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -5,8 +5,10 @@ https://github.com/josdejong/jsoneditor ## not yet released, version 5.5.0 -- Implemented a dropdown for values having an JSON Schema enum. Thanks @tdakanalis. - +- Implemented a dropdown for values having an JSON Schema enum. + Thanks @tdakanalis. +- Fixed #291, #292: Some CSS broken when using the editor in combination with + bootstrap. Thanks @nucleartide. ## 2016-04-09, version 5.4.0 diff --git a/test/test_bootstrap.html b/test/test_bootstrap.html index 50baaff..e123852 100644 --- a/test/test_bootstrap.html +++ b/test/test_bootstrap.html @@ -1,10 +1,8 @@ - - - - + +