Merge remote-tracking branch 'origin/dev' into feature/issue2880

AtlasOfLivingAustralia · Oct 3, 2024 · 69c413d · 69c413d
2 parents 3013d81 + d92bfd6
commit 69c413d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -188,7 +188,7 @@ dependencies {
     providedCompile "io.methvin:directory-watcher:0.4.0"
 
     if (!Boolean.valueOf(inplace)) {
-        implementation "org.grails.plugins:ecodata-client-plugin:7.0-SNAPSHOT"
+        implementation "org.grails.plugins:ecodata-client-plugin:7.0"
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-meritVersion=4.0-SNAPSHOT
+meritVersion=4.1-SNAPSHOT
 grailsVersion=6.2.0
 grailsGradlePluginVersion=6.1.2
 gormVersion=8.1.2

diff --git a/grails-app/views/site/_map.gsp b/grails-app/views/site/_map.gsp
@@ -51,8 +51,8 @@
                               data-bind="value: context"
                               class="form-control"
                               name='context'
-                              from="['choose site context','Pastoral','Industrial','Urban','Coastal', 'Reserve', 'Private land']"
-                              keys="['none','Pastoral','Industrial','Urban','Coastal','Reserve', 'Private land']"/>
+                              from="['choose site context','Pastoral','Industrial','Urban','Coastal', 'Reserve', 'Private land', 'Marine']"
+                              keys="['none','Pastoral','Industrial','Urban','Coastal','Reserve', 'Private land', 'Marine']"/>
                     </div>
                 </div>