diff options
| author | James Lopez <james@jameslopez.es> | 2016-01-22 18:01:38 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-01-22 18:01:38 +0100 |
| commit | 3d81f1da6e9a0b7370c3318a9f7851af88918ace (patch) | |
| tree | 0265dc26079da9975184de44d9b28bfb9bd9d357 /doc/ci/languages/php.md | |
| parent | ba07a4c96a90a0cbe81ae7e987f32cc8eac20323 (diff) | |
| parent | 0e51ca7c4841bb388c0decb57ecc64af86c77805 (diff) | |
| download | gitlab-ce-3d81f1da6e9a0b7370c3318a9f7851af88918ace.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4
# Conflicts:
# .gitlab-ci.yml
Diffstat (limited to 'doc/ci/languages/php.md')
| -rw-r--r-- | doc/ci/languages/php.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/languages/php.md b/doc/ci/languages/php.md index dacb67fa3ff..77f9fae5bb6 100644 --- a/doc/ci/languages/php.md +++ b/doc/ci/languages/php.md @@ -12,7 +12,7 @@ configuration from the developer. To overcome this we will be using the official [PHP docker image][php-hub] that can be found in Docker Hub. This will allow us to test PHP projects against different versions of PHP. -However, not everything is plug 'n' play, you still need to onfigure some +However, not everything is plug 'n' play, you still need to configure some things manually. As with every build, you need to create a valid `.gitlab-ci.yml` describing the |