Merge branch 'patch-5' of https://github.com/DanielNemanic/snipe-it i…

…nto DanielNemanic-patch-5 # Conflicts: # app/views/backend/models/view.blade.php
nikammarafiy · May 2, 2015 · 527650d · 527650d
2 parents 1261210 + 6f9daa2
commit 527650d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/config/version.php b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
   'app_version' => 'v1.2.7-beta',
-  'hash_version' => 'v1.2.7-beta-6-g1137768',
+  'hash_version' => 'v1.2.7-beta-10-g48ccf84',
 );
diff --git a/app/views/backend/models/view.blade.php b/app/views/backend/models/view.blade.php
@@ -113,7 +113,7 @@
                                 @endif
 
                                 @if ($model->image)
-                                <li><br /><img src="/uploads/models/{{{ $model->image }}}" class="img-responsive" /></li>
+                                <li><br /><img src="{{ Config::get('app.url') }}/uploads/models/{{{ $model->image }}}" /></li>
                                 @endif
 
                                 @if  ($model->deleted_at!='')