Backport all fixes from the master to 1.1

This commit is contained in:
Graham Campbell
2015-08-03 14:23:46 +01:00
parent 5bdbc87bf2
commit 90baf18724
7 changed files with 109 additions and 24 deletions
+1 -2
View File
@@ -13,13 +13,12 @@ namespace CachetHQ\Cachet\Models;
use CachetHQ\Cachet\Presenters\SubscriberPresenter;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use McCool\LaravelAutoPresenter\HasPresenter;
use Watson\Validating\ValidatingTrait;
class Subscriber extends Model implements HasPresenter
{
use SoftDeletes, ValidatingTrait;
use ValidatingTrait;
/**
* The validation rules.