Merge branch 'QA_4_7'

2017-06-01 15:18:39 +02:00 · 2017-06-01 15:18:39 +02:00 · 0893c067a7
commit 0893c067a7
parent 90a6678500 e10a7fd5d4
1 changed files with 1 additions and 0 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -73,6 +73,7 @@ matrix:
        - brew update
        - brew install gettext php70 mariadb
        - brew link --force gettext
+        - sed -i 's/^memory_limit = .*/memory_limit = -1/' /usr/local/etc/php/7.0/php.ini
        - curl https://getcomposer.org/installer | php
        - ln -s "`pwd`/composer.phar" /usr/local/bin/composer
        - mysql.server start