Add condition
option to local queries
#450
Merged
condition
option to local queries
#450