Resolve conflicts from merge of master into urlstate
authorMike Taylor <mike@indexdata.com>
Mon, 29 Jun 2015 16:34:05 +0000 (17:34 +0100)
committerMike Taylor <mike@indexdata.com>
Mon, 29 Jun 2015 16:34:05 +0000 (17:34 +0100)
1  2 
src/mkws-widget-main.js

Simple merge