Merge remote-tracking branch 'marcuswestin/master'

vontio · vontio · commit 981d82b3f398 · 2015-12-26T19:44:00.000+08:00
diff --git a/Changelog b/Changelog
@@ -17,6 +17,9 @@ Intended v5.0.0
 + Removed `WebViewJavascriptBridge -reset`. It should never have been exposed as a public API.
 + Fixed compilation in C99 mode
 
+Next version
++ Pretty-print json in log messages
+
 v4.1.4
 + Improve how WVJB handles the case when there is no ObjC handler for a message received from js.
 + If an objc handler throws and exception, let it bubble up to the webkit engine instead of catching it in WVJB.
diff --git a/Roadmap.md b/Roadmap.md
@@ -15,8 +15,9 @@ v4.1.7
 Pull requests:
 - [ ] Dev env / docs
 	- [ ] Automated tests (PR #128, I #151)
+		- [ ] Travis? https://github.com/integrations/feature/code
 	- [ ] Embed js in objc source (PR #129)
-		- [ ] Also fixes PR #138, I #160
+		- [ ] Also fixes PR #138, I #160, I #108
 	- [ ] Docs for podfile installation (PR #140)
 - [ ] Features & fixes to consider
 	- [ ] Message response timeout (PR #106)
