Merge branch 'master' of bitbucket.org:colosa/processmaker

Conflicts: workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
2014-07-01 10:00:27 -04:00
parent b33b393bec 5727b4f284
commit 3f957f2a93
5 changed files with 154 additions and 61 deletions
--- a/workflow/engine/src/ProcessMaker/Services/Api/Project/Variable.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/Project/Variable.php
@@ -55,7 +55,7 @@ class Variable extends Api
     *
     * @status 201
     */
-    public function doPostVariable($prj_uid, array $request_data)
+    public function doPostVariable($prj_uid, $request_data)
    {
        try {
            $request_data = (array)($request_data);