silverstripe-comments/.travis.yml

version: ~> 1.0

import:
<<<<<<< HEAD
=======
<<<<<<< HEAD
  - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range.yml
=======
>>>>>>> 3.4
  - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range-npm.yml

env:
  global:
    - REQUIRE_EXTRA:"ezyang/htmlpurifier:*"
<<<<<<< HEAD
=======
>>>>>>> 3.3
>>>>>>> 3.4
MNT Use shared travis config, use sminnee/phpunit 2020-11-16 03:24:51 +01:00			`version: ~> 1.0`
Travis support 2013-03-29 09:33:51 +01:00
MNT Use shared travis config, use sminnee/phpunit 2020-11-16 03:24:51 +01:00			`import:`
Merge branch '3.4' into 3 2021-03-20 22:28:31 +01:00			`<<<<<<< HEAD`
			`=======`
Merge branch '3.3' into 3.4 2021-03-20 22:27:53 +01:00			`<<<<<<< HEAD`
MNT Travis shared config, use sminnee/phpunit 2020-12-01 08:34:24 +01:00			`- silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range.yml`
Merge branch '3.3' into 3.4 2021-03-20 22:27:53 +01:00			`=======`
Merge branch '3.4' into 3 2021-03-20 22:28:31 +01:00			`>>>>>>> 3.4`
MNT Use shared travis config, use sminnee/phpunit 2020-11-16 03:24:51 +01:00			`- silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range-npm.yml`
Travis support 2013-03-29 09:33:51 +01:00
MNT Use shared travis config, use sminnee/phpunit 2020-11-16 03:24:51 +01:00			`env:`
			`global:`
			`- REQUIRE_EXTRA:"ezyang/htmlpurifier:*"`
Merge branch '3.4' into 3 2021-03-20 22:28:31 +01:00			`<<<<<<< HEAD`
			`=======`
Merge branch '3.3' into 3.4 2021-03-20 22:27:53 +01:00			`>>>>>>> 3.3`
Merge branch '3.4' into 3 2021-03-20 22:28:31 +01:00			`>>>>>>> 3.4`