Merge branch 'master' into prepare-3.1.0-release

flagbit · Sep 23, 2019 · c39d449 · c39d449
2 parents 8438cc0 + 6f5187d
commit c39d449
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,6 +23,10 @@ before_install:
   # disable default memory limit
   - export INI=~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - echo memory_limit = -1 >> $INI
+  - echo "extension = apcu.so" >> $INI
+  - pear config-set preferred_state beta
+  - pecl channel-update pecl.php.net
+  - yes | pecl install imagick
 
 install:
   - travis_retry composer install $COMPOSER_OPTS

diff --git a/src/Resources/config/assets.yml b/src/Resources/config/assets.yml
diff --git a/src/Resources/public/less/index.less b/src/Resources/public/less/index.less
@@ -0,0 +1 @@
+@import "./web/bundles/flagbittableattribute/less/tableattribute.less";
diff --git a/src/Resources/public/css/tableattribute.less → ...Resources/public/less/tableattribute.less b/src/Resources/public/css/tableattribute.less → ...Resources/public/less/tableattribute.less
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		@import "./web/bundles/flagbittableattribute/less/tableattribute.less";