Merge branch 'pr/1046' into release/1.7.8
This commit is contained in:
bnu 2014-12-01 17:58:43 +09:00
commit 1fa54b6930

View file

@ -8,7 +8,7 @@
<conditions>
<condition operation="equal" column="module_srl" var="module_srl" pipe="and" />
<condition operation="in" column="module_srl" var="module_srls" pipe="and" />
<condition operation="equal" column="site_srl" var="site_srl" />
<condition operation="equal" column="site_srl" var="site_srl" pipe="and" />
<condition operation="equal" column="module" var="module" pipe="and" />
<condition operation="equal" column="module_category_srl" var="module_category_srl" />
</conditions>