Merge remote-tracking branch 'upstream/master' into remove-unreachabl…

…e-statement
liip · Apr 23, 2014 · 62b349d · 62b349d
2 parents 88a8183 + a32e9ac
commit 62b349d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,8 +7,6 @@ php:
 
 env:
   - SYMFONY_VERSION=2.3.*
-  - SYMFONY_VERSION=2.4.*
-  - SYMFONY_VERSION=dev-master
 
 before_script:
   - composer require symfony/framework-bundle:${SYMFONY_VERSION} --prefer-source

diff --git a/Resources/doc/filters.md b/Resources/doc/filters.md
@@ -135,6 +135,8 @@ liip_image:
                     # Position: One of topleft,top,topright,left,center,right,bottomleft,bottom,bottomright
                     position: center
 ```
+> Please note that position of watermark filter is important. If you have some filters like `crop` after it is possible
+> that watermark image will be cropped.
 
 ### The `auto_rotate` filter