From e9605891f3f48f9970e22776f7cac647bb0dea06 Mon Sep 17 00:00:00 2001
From: Daniel Meltzer <parallelgrapefruit@gmail.com>
Date: Fri, 10 Jun 2016 07:44:45 -0500
Subject: [PATCH] Merge upstream and fix changes.

---
 app/Http/Controllers/AssetsController.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index 7ae1c205bb..72b767f59d 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -297,9 +297,8 @@ class AssetsController extends Controller
     * @return Redirect
     */
 
-    public function postEdit($assetId = null, AssetRequest $request)
+    public function postEdit(AssetRequest $request, $assetId = null)
     {
-        exit;
         // Check if the asset exists
         if (!$asset = Asset::find($assetId)) {
             // Redirect to the asset management page with error