test new branch

alex
1 parent e37bf1d4
Showing 2 changed files with 11 additions and 2 deletions Show diff stats
common/mail/passwordResetToken-html.php
common/messages/ru/core.php
@@ -2,7 +2,7 @@
 use yii\helpers\Html;
  
 /* @var $this yii\web\View */
-/* @var $user common\models\User */
+/* @var $user common\models\User */ 
  
 $resetLink = Yii::$app->urlManager->createAbsoluteUrl(['site/reset-password', 'token' => $user->password_reset_token]);
 ?>
 <?php
+<<<<<<< Updated upstream
 return [
     'name'=>'Имя',
     'email'=>'Email',
@@ -6,4 +7,12 @@ return [
     'message'=>'Сообщение',
     'Send' => 'Отправить',
     'Send message'=>'Отправить сообщение',
-];
 \ No newline at end of file
+];
+=======
+    /**
+     * Created by PhpStorm.
+     * User: user
+     * Date: 17.05.18
+     * Time: 11:26
+     */
+>>>>>>> Stashed changes