From 1bae7c17d0db47e14137fde269080beff7c0bef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Tue, 10 Dec 2019 11:48:21 -0300
Subject: [PATCH 1/2] Add support for Amharic language
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 libraries/classes/LanguageManager.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libraries/classes/LanguageManager.php b/libraries/classes/LanguageManager.php
index 692b8d9ceb56..1627615351b7 100644
--- a/libraries/classes/LanguageManager.php
+++ b/libraries/classes/LanguageManager.php
@@ -38,6 +38,13 @@ class LanguageManager
             'af|afrikaans',
             '',
         ),
+        'am' => array(
+            'am',
+            'Amharic',
+            'አማርኛ',
+            'am|amharic',
+            '',
+        ),
         'ar' => array(
             'ar',
             'Arabic',

From e309499a5f5cf71046c7dd2850aecd98a3804b56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Tue, 10 Dec 2019 11:49:10 -0300
Subject: [PATCH 2/2] Ignore platform requirements for PHP nightly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d3d53ffac2a6..86776dc7ebfa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,6 @@ services:
   - mysql
 
 php:
-  - "nightly"
   - "7.4"
   - "7.3"
   - "7.2"
@@ -116,6 +115,10 @@ matrix:
         - pecl channel-update pecl.php.net
         - pecl install dbase
         - test/ci-install-test
+    - php: "nightly"
+      env: CI_MODE=test
+      install:
+        - composer install --no-interaction --ignore-platform-reqs
 
   allow_failures:
     - php: "nightly"