Merge branch 'master' into templateallthemarkup
authorJason Skomorowski <jason@indexdata.com>
Mon, 7 Jul 2014 23:30:04 +0000 (19:30 -0400)
committerJason Skomorowski <jason@indexdata.com>
Mon, 7 Jul 2014 23:30:04 +0000 (19:30 -0400)
commitcda7d85862a85b0841478d87a086582cb02ba002
treedaecde4bde84397f637877d3816c993637283e11
parent24a2e08e37e327c7db67d2c3a26dc6f88e73856b
parent7bd030f15309e4349183ea5d5961378706f357d0
Merge branch 'master' into templateallthemarkup

Conflicts:
src/.gitignore
src/mkws-core.js
src/mkws-team.js
src/mkws-widget-termlists.js
tools/htdocs/Makefile
README
src/mkws-core.js
src/mkws-team.js
src/mkws-templates.js
src/mkws-widget-main.js
tools/htdocs/Makefile