modifies fixture-filters to use fixture-with-attributes
modifies fixture-filters to use fixture-with-attributes
modifies fixture-filters to use fixture-with-attributes
Merge branch 'master' into fixtu-att
Merge remote-tracking branch 'psi-reports/fixt-att' into attrib-fixture
Merge remote-tracking branch 'hsph-reports/fixtu-att' into attrib-fixture
Merge remote-tracking branch 'hq-pact/fixtu-att' into attrib-fixture
Merge pull request #2869 from dimagi/attrib-fixture-subtree-merge

Attrib fixture subtree merge