 huang
|
6fccc7b50c
|
Merge branch 'develop' into dev_cache
Conflicts:
.gitignore
app/controllers/blogs_controller.rb
app/controllers/users_controller.rb
app/helpers/application_helper.rb
app/models/comment.rb
app/models/journals_for_message.rb
app/models/news.rb
app/views/courses/_course_activity_users.html.erb
app/views/layouts/new_base_user.html.erb
app/views/projects/_act_messages.html.erb
app/views/projects/_project_message_contents.html.erb
app/views/users/_course_homework.html.erb
app/views/users/_course_journalsformessage.html.erb
app/views/users/_course_message.html.erb
app/views/users/_course_news.html.erb
app/views/users/_homework_post_reply.html.erb
app/views/users/_message_contents.html.erb
app/views/users/_news_contents.html.erb
app/views/users/_project_message.html.erb
app/views/users/_user_blog.html.erb
app/views/users/_user_journalsformessage.html.erb
|
2016-12-12 16:35:20 +08:00 |
cxt
yuanke
Tim