Merge branch 'wm-master' into wm-develop

GeoNode · Oct 4, 2017 · d49ef23 · d49ef23
2 parents 7df6e07 + 42b6165
commit d49ef23
Show file tree

Hide file tree

Showing 13 changed files with 59 additions and 604 deletions.
diff --git a/geonode/certification/__init__.py b/geonode/certification/__init__.py
diff --git a/geonode/certification/fixtures/certification_data.json b/geonode/certification/fixtures/certification_data.json
diff --git a/geonode/certification/models.py b/geonode/certification/models.py
diff --git a/geonode/certification/templates/certification/certification_add.html b/geonode/certification/templates/certification/certification_add.html
diff --git a/geonode/certification/templates/certification/certification_remove.html b/geonode/certification/templates/certification/certification_remove.html
diff --git a/geonode/certification/templatetags/__init__.py b/geonode/certification/templatetags/__init__.py