Skip to content

Commit

Permalink
Merge 3caa1c2 into eae9615
Browse files Browse the repository at this point in the history
  • Loading branch information
atanvarno69 committed May 20, 2017
2 parents eae9615 + 3caa1c2 commit 394ecaf
Show file tree
Hide file tree
Showing 53 changed files with 2,983 additions and 1,173 deletions.
12 changes: 3 additions & 9 deletions .gitattributes
Expand Up @@ -2,17 +2,11 @@
* text=auto

# Declare files that will always have LF line endings on checkout.
*.css text eol=lf
*.html text eol=lf
*.json text eol=lf
*.md text eol=lf
*.php text eol=lf

# Denote all files that are truly binary and should not be modified.
*.jpg binary
*.png binary
*.ttf binary
*.otf binary
*.woff binary
*.xml text eol=lf
*.yml text eol=lf

# Ignore for distribution
/docs export-ignore
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
@@ -1,4 +1,7 @@
# Managed by Composer
composer.lock
composer.phar
/vendor/
vendor/

# Managed by CI
build/
4 changes: 0 additions & 4 deletions .travis.yml
Expand Up @@ -3,10 +3,6 @@ php:
- 7.0
- 7.1

before_install:
- echo "extension = apcu.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- echo "apc.enable_cli = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini

before_script:
- travis_retry composer install --no-interaction --prefer-source

Expand Down

0 comments on commit 394ecaf

Please sign in to comment.