diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-01-03 09:05:48 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-01-03 09:05:48 +0000 |
| commit | 215662afdee3935f66e5fbd73260e2039f5216de (patch) | |
| tree | 817b578e53b884c4b5facd63c166b522f59a8978 /test | |
| parent | c3e7806acbd32483eab497a347f947158ab8febf (diff) | |
| parent | 1a82a00a2b45041c35b72ab16ee34c120341b652 (diff) | |
Merge branch 'develop' into 'fix-move-type-notification'
# Conflicts:
# static/fontello.json
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/nightwatch.conf.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/e2e/nightwatch.conf.js b/test/e2e/nightwatch.conf.js index 2fc3af0b..07d974df 100644 --- a/test/e2e/nightwatch.conf.js +++ b/test/e2e/nightwatch.conf.js @@ -1,4 +1,4 @@ -require('babel-register') +require('@babel/register') var config = require('../../config') // http://nightwatchjs.org/guide#settings-file |