Merge branch '4.8' into 4

2021-05-17 16:34:51 +12:00 · 2021-05-17 16:34:51 +12:00 · 8098a7c61f
parent e101f1e034 1d9940aab0
commit 8098a7c61f
2 changed files with 8 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -5,5 +5,4 @@ import:

 env:
  global:
-    - COMPOSER_ROOT_VERSION="4.x-dev"
-    - REQUIRE_RECIPE="$COMPOSER_ROOT_VERSION"
+    - REQUIRE_RECIPE="4.x-dev"
--- a/lang/sl.yml
+++ b/lang/sl.yml
@ -0,0 +1,7 @@
+sl:
+  SilverStripe\Reports\ReportAdmin:
+    MENUTITLE: Poročila
+    ReportTitle: Naslov
+  SilverStripe\Reports\SideReport:
+    OtherGroupTitle: Drugo
+    REPEMPTY: 'Poročilo ''{title}'' je prazno.'