Merge branch 'master' into develop

Conflicts: .travis.yml
zf2timo · May 21, 2015 · f0dbf9f · f0dbf9f
2 parents 6176d3d + 4c47dd1
commit f0dbf9f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ php:
 before_script:
   - mkdir -p build/coverage
   - composer self-update
-  - composer update --prefer-source -v --dev
+  - composer update --prefer-source
 
 script: 
   - phpunit

diff --git a/src/tteMaintenance/Provider/AbstractProvider.php b/src/tteMaintenance/Provider/AbstractProvider.php
@@ -1,5 +1,6 @@
 <?php
 
+
 namespace tteMaintenance\Provider;
 
 use tteMaintenance\Options\ModuleOptionsInterface;