dih/dis/resolver wip 16
Merge branch 'master' of github.com:indexisto/indexisto
Merge branch 'master' of github.com:indexisto/indexisto
compatibility hotfix
img