Merge branch 'master' into prettysimple
authorJason Skomorowski <jason@indexdata.com>
Tue, 4 Nov 2014 17:15:00 +0000 (12:15 -0500)
committerJason Skomorowski <jason@indexdata.com>
Tue, 4 Nov 2014 17:15:00 +0000 (12:15 -0500)
commit4cd2b3de24d03395424d3f6fc58fe9dbaa87c22d
tree23f3cec09f9824ae08ce53d8af89b47657c07061
parentd078290221640ee4334c3953e80972515cb10d21
parent22de5f3d36b92a7e30070dfa52ab5de74bc1b4cb
Merge branch 'master' into prettysimple

Conflicts:
src/templates/facets.handlebars
src/mkws-widget-main.js
src/templates/facets.handlebars