Merge branch 'master' into PHRAS-2666_slow-notifications_4.1

This commit is contained in:
Nicolas Maillat
2019-07-31 16:12:49 +02:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

@@ -14,7 +14,7 @@
# - php
- xdebug
# - composer
# - mailcatcher
- mailcatcher
# - node
# - yarn
# - ffmpeg

View File

@@ -13,7 +13,7 @@
- name: Install mailcatcher gem
# gem module is flaky, this is consistent
command: gem install mailcatcher --conservative
command: gem install mailcatcher -v 0.6.4 --conservative
ignore_errors: yes
- name: Install mailcatcher supervisord conf