Merge branch 'master' of https://github.com/fabianmarz/invoice-ninja

Conflicts: app/views/clients/show.blade.php
2015-02-18 23:00:37 +01:00 · 2015-02-18 23:00:37 +01:00 · 6e9fe96f8f
commit 6e9fe96f8f
parent 53111d7584 073cd4e926
1 changed files with 0 additions and 5 deletions
--- a/app/views/clients/show.blade.php
+++ b/app/views/clients/show.blade.php
@ -10,11 +10,6 @@
 			{{ Former::text('id')->value($client->public_id) }}
 		</div>

-        @if ($gatewayLink)
-            {{ Button::link($gatewayLink, trans('texts.view_in_stripe'), ['target' => '_blank']) }}
-        @endif
-
-		@if ($client->trashed())
 		@if ($client->trashed())
 			{{ Button::primary(trans('texts.restore_client'), ['onclick' => 'onRestoreClick()']) }}
 		@else