get_wms is now optional
.
Fixed merge conflict
Merge branch 'simple' of github.com:ingenieroariel/geonode into simple
.
.