Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-10-31 17:27:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
David Bomba 2016-03-20 09:38:19 +11:00
commit e4a723b6ea
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Models/Vendor.php
View File

@ -5,6 +5,7 @@ use DB;
use Carbon; use Carbon;
use App\Events\VendorWasCreated; use App\Events\VendorWasCreated;
use App\Events\VendorWasUpdated; use App\Events\VendorWasUpdated;
use App\Events\VendorWasDeleted;
use Laracasts\Presenter\PresentableTrait; use Laracasts\Presenter\PresentableTrait;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;

3
resources/lang/en/texts.php
View File

@ -1075,6 +1075,9 @@ $LANG = array(
'gateway_help_20' => ':link to sign up for Sage Pay.', 'gateway_help_20' => ':link to sign up for Sage Pay.',
'gateway_help_21' => ':link to sign up for Sage Pay.', 'gateway_help_21' => ':link to sign up for Sage Pay.',
'partial_due' => 'Partial Due', 'partial_due' => 'Partial Due',
'restore_vendor' => 'Restore Vendor',
'restored_vendor' => 'Successfully restored vendor',
'restored_expense' => 'Successfully restored expense',
); );