Merge remote-tracking branch 'refs/remotes/origin/dev'

developcreativo · Nov 7, 2015 · b223efd · b223efd
2 parents c1a43b2 + 9a60d10
commit b223efd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/Http/Controllers/formapagoController.php b/app/Http/Controllers/formapagoController.php
@@ -16,7 +16,7 @@ class formapagoController extends Controller
      */
     public function index()
     {
-        //
+        //  
         $forma_pagos = formas_pago::all();
         return view('app.finanzas.forma_pago.forma_pago_index', compact('forma_pagos'));
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ class formapagoController extends Controller @@
          */
         public function index()
         {
-            //
+            //
             $forma_pagos = formas_pago::all();
             return view('app.finanzas.forma_pago.forma_pago_index', compact('forma_pagos'));
         }
@@ Expand Down @@