Merge branch 'master' into templateallthemarkup
authorJason Skomorowski <jason@indexdata.com>
Mon, 4 Aug 2014 15:15:46 +0000 (11:15 -0400)
committerJason Skomorowski <jason@indexdata.com>
Mon, 4 Aug 2014 15:15:46 +0000 (11:15 -0400)
commit403652c2b7e7c5ca39d21a2d8e35151e12bdd9a0
tree3ba9ba96270c3f8a0caab9da2ed901eb22c7e033
parent88601f8d8ed0c9dc6c095c13f02b15964f52f0e0
parenta3507a2e136008e3e2e0ae407ce52cf2657fce6e
Merge branch 'master' into templateallthemarkup

Conflicts:
examples/htdocs/jasmine-local-popup.html
tools/htdocs/Makefile
examples/htdocs/jasmine-local-popup.html
src/mkws-core.js
src/mkws-team.js
src/mkws-widget-main.js
tools/htdocs/Makefile