Mike Schwörer 4c36123fd7 Merge remote-tracking branch 'upstream/master' into feature_xpath ... # Conflicts: # Gruntfile.js # src/js/.jshintrc		2016-12-16 22:15:53 +01:00
..
css	BUGFIX: Flow control ops are now correctly highlighted when a breakpoint is triggered on them.	2016-12-14 12:43:57 +00:00
html	Favicon changed to a data URL to prevent re-requests in some circumstances. #21	2016-11-30 19:50:21 +00:00
js	Merge remote-tracking branch 'upstream/master' into feature_xpath	2016-12-16 22:15:53 +01:00
static	Replaced jsHint with eslint. Fixes #4.	2016-12-14 16:39:17 +00:00