[resolver] Add ability to force resolver.#684

Merged

makasim merged 2 commits intoliip:masterfrom formapro-forks:force-resolver

Dec 27, 2015

+53-26

Commits on Dec 25, 2015

[resolver] Add ability to force resolver.
makasim
committed
[config] Do not perform deep merging. Allow overwrite resolvers in several conf files.
makasim
committed