Merge branch '3.2'

Signed-off-by: crynobone <crynobone@gmail.com>

.travis.yml

@@ -15,10 +15,10 @@ env:
 before_script:
   - travis_retry composer self-update
   - composer config discard-changes true
-  - if [[ $setup = 'basic' ]]; then travis_retry composer install --prefer-source --no-interaction; fi
-  - if [[ $setup = 'stable' ]]; then travis_retry composer update --prefer-source --no-interaction --prefer-stable; fi
-  - if [[ $setup = 'lowest' ]]; then travis_retry composer update --prefer-source --no-interaction --prefer-lowest --prefer-stable; fi
-  - if [[ $setup = 'coveralls' ]]; then travis_retry composer require "psr/log=1.0.0" "satooshi/php-coveralls=~0.6" --prefer-source --no-interaction --dev; fi
+  - if [[ $setup = 'basic' ]]; then travis_retry composer install --prefer-dist --no-interaction; fi
+  - if [[ $setup = 'stable' ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-stable; fi
+  - if [[ $setup = 'lowest' ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable; fi
+  - if [[ $setup = 'coveralls' ]]; then travis_retry composer require "satooshi/php-coveralls=~0.7" --prefer-dist --no-interaction --dev; fi
 
 script:
   - if [[ $coverage = 'yes' ]]; then phpunit -c phpunit.xml --coverage-clover build/logs/clover.xml; fi
@@ -36,7 +36,7 @@ matrix:
     - php: 5.6
       env: setup=coveralls coverage=yes
   allow_failures:
-    - env: setup=lowest
     - env: setup=stable
+    - env: setup=coveralls coverage=yes
     - php: hhvm
   fast_finish: true

docs/changes.md

@@ -3,6 +3,12 @@ title: FTP Updater Change Log
 
 ---
 
+## Version 3.2 {#v3-2}
+
+### v3.2.0 {#v3-2-0}
+
+* Update support for Orchestra Platform v3.2.
+
 ## Version 3.1 {#v3-1}
 
 ### v3.1.0 {#v3-1-0}