Merge pull request #29 from kijin/xetown-branding

XETown Remix branding and .travis.yml fixes
This commit is contained in:
Kijin Sung 2016-01-06 13:59:19 +09:00
commit ef0c9e34ac
2 changed files with 6 additions and 7 deletions

View file

@ -4,12 +4,12 @@ php:
- 5.4 - 5.4
- 5.5 - 5.5
- 5.6 - 5.6
- 7 - 7.0
- hhvm - hhvm
matrix: matrix:
allow_failures: allow_failures:
- php: 7
- php: hhvm - php: hhvm
fast_finish: true
sudo: false sudo: false
before_script: before_script:
- travis_retry composer self-update - travis_retry composer self-update
@ -26,6 +26,4 @@ script:
- if [ $(phpenv version-name) != "5.3" ]; then ./vendor/bin/codecept build; fi - if [ $(phpenv version-name) != "5.3" ]; then ./vendor/bin/codecept build; fi
- if [ $(phpenv version-name) != "5.3" ]; then ./vendor/bin/codecept run -d --fail-fast --env travis; fi - if [ $(phpenv version-name) != "5.3" ]; then ./vendor/bin/codecept run -d --fail-fast --env travis; fi
notifications: notifications:
slack: email: false
secure: jpoMjtkveVuPZM4JXJETAPv8QUCtTbI/ZTixdS9HUgxSb9tD2DkoekMaRzXYnXA82Les/gGxTC0fQFcFrls6Ypkbvp1udBPggmAdLiBHubBIz+yd1BGIf/l4I6MY1QmGe1Lx4xlnVlEgLnKXHn+W+ENep4/MzpCEaR9Vw8wfGqY=
secure: "gPv4qFmGcXimNlI/OeVk5n4VtRCWbAe7VUtw7Inb3A/ZZaVDo11gtMNkwo/JVKSnXqFkaCQYebcNpj2D9Rb2ZCwgjMSX6wxvpA4/8OLOZpbWqFW6Hz2RKNggubXlnalXkIwFcsvj70rKctbcJFk2C1G9rVvYWdVGD9X4/ozQtAc="

View file

@ -1,5 +1,6 @@
XpressEngine With XETOWN XpressEngine XETOWN Remix
============ =========================
develop 브랜치에서 쓸만한 PR Merge! develop 브랜치에서 쓸만한 PR Merge!
xe core 새버전이 나오면 master 브랜치에서 Merge후 develop 브랜치와 최종 Merge! xe core 새버전이 나오면 master 브랜치에서 Merge후 develop 브랜치와 최종 Merge!