Merge branch 'master' of https://github.com/wemersonjanuario/wkhtmlto…

…pdf-windows Conflicts: composer.json
wemersonjanuario · Jan 23, 2015 · 914658c · 914658c
2 parents 40b9e69 + 5059377
commit 914658c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -12,8 +12,9 @@
     ],
     "minimum-stability": "stable",   
 	"bin": [
-        "bin/32-bit/wkhtmltopdf"
+        "bin/wkhtmltopdf-32bit.exe",
+        "bin/wkhtmltopdf-64bit.exe"
     ],
     "require": {
     }
-}
+}