Skip to content

Commit 527650d

Browse files
committed
Merge branch 'patch-5' of https://github.com/DanielNemanic/snipe-it into DanielNemanic-patch-5
# Conflicts: # app/views/backend/models/view.blade.php
2 parents 1261210 + 6f9daa2 commit 527650d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

app/config/version.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
22
return array (
33
'app_version' => 'v1.2.7-beta',
4-
'hash_version' => 'v1.2.7-beta-6-g1137768',
4+
'hash_version' => 'v1.2.7-beta-10-g48ccf84',
55
);

app/views/backend/models/view.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
@endif
114114

115115
@if ($model->image)
116-
<li><br /><img src="/uploads/models/{{{ $model->image }}}" class="img-responsive" /></li>
116+
<li><br /><img src="{{ Config::get('app.url') }}/uploads/models/{{{ $model->image }}}" /></li>
117117
@endif
118118

119119
@if ($model->deleted_at!='')

0 commit comments

Comments
 (0)