Merge branch 'release/2.2.0' into master

jinjie · May 31, 2021 · 23e7346 · 23e7346
2 parents 33402b3 + d6bf6b4
commit 23e7346
Show file tree

Hide file tree

Showing 4 changed files with 184 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -15,7 +15,3 @@ endif
 	rm -rf silverstripe-cache/
 	mkdir silverstripe-cache/
 	vendor/bin/sake dev/build
-
-# Sync assets from development host to staging
-# staging_rsync:
-#     rsync -avzh public/assets user@mystagingserver:path/to/public
diff --git a/composer.json b/composer.json
@@ -12,7 +12,8 @@
         "silverstripe/login-forms": "^4.2",
         "jinjie/silverstripe-admin-material-icons": "^0.0.1",
         "dnadesign/silverstripe-elemental": "^4",
-        "jinjie/slickhero-elemental": "^1.0"
+        "jinjie/slickhero-elemental": "^1.0",
+        "dnadesign/silverstripe-elemental-userforms": "^3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7"

diff --git a/composer.lock b/composer.lock
diff --git a/themes/app/templates/Page.ss b/themes/app/templates/Page.ss
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="{$ContentLocale}">
 <head>
     <% base_tag %>
     {$MetaTags(false)}