chenx221/yii2-netdisk
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge commit 'bdce87b242abbff800020deba0a5c2031fc2efe7' into feature-restapi

Browse Source 
Conflicts:
	framework/db/BaseActiveRecord.php
This commit is contained in:
Qiang Xue 2014-03-06 00:00:33 -05:00
commit 4fa285a4db
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -1,7 +1,7 @@
{ {
"name": "yiisoft/yii2-app-basic", "name": "yiisoft/yii2-app-basic",
"description": "Yii 2 Basic Application Template", "description": "Yii 2 Basic Application Template",
"keywords": ["yii", "framework", "basic", "application template"], "keywords": ["yii2", "framework", "basic", "application template"],
"homepage": "http://www.yiiframework.com/", "homepage": "http://www.yiiframework.com/",
"type": "project", "type": "project",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",

3
mail/layouts/html.php
View File

@ -1,10 +1,9 @@
<?php <?php
use yii\helpers\Html; use yii\helpers\Html;
use yii\mail\BaseMessage;
/** /**
* @var \yii\web\View $this * @var \yii\web\View $this
* @var BaseMessage $content * @var \yii\mail\BaseMessage $content
*/ */
?> ?>
<?php $this->beginPage() ?> <?php $this->beginPage() ?>