From 5cf88a287b3e343a793adb74adfa126ac5cfa8d7 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 16 Dec 2015 11:37:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_group_attr.html.erb | 2 +-
 db/schema.rb                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_user_group_attr.html.erb b/app/views/users/_user_group_attr.html.erb
index aa8166a04..652cb723a 100644
--- a/app/views/users/_user_group_attr.html.erb
+++ b/app/views/users/_user_group_attr.html.erb
@@ -11,7 +11,7 @@
 <div class="mb10 mt10">
   <label>
     <input type="checkbox" class="mr5" name="base_on_project" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.base_on_project : 0 %>" id="base_on_project"/>
-    <span class="f14 fontGrey3 mr10">是否基于项目实施</span>
+    <span class="f14 fontGrey3 mr10">基于项目实施</span>
   </label>
   <p class="c_red">提醒：勾选后各小组必须在Trustie平台创建项目，教师可随时观察平台对各小组最新进展的实时统计。</p>
 </div>
diff --git a/db/schema.rb b/db/schema.rb
index 5f53dd5cf..51020f45d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20151215070238) do
+ActiveRecord::Schema.define(:version => 20151215112107) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false