Merge remote-tracking branch 'origin/szzh' into szzh

This commit is contained in:
lizanle 2015-03-18 10:17:33 +08:00
commit b4f99c75da
1 changed files with 1 additions and 1 deletions

View File

@ -20,7 +20,7 @@ class WelcomeController < ApplicationController
include WelcomeHelper
helper :project_score
caches_action :robots
before_filter :find_first_page, :only => [:index]
#before_filter :find_first_page, :only => [:index]
# before_filter :fake, :only => [:index, :course]
before_filter :entry_select, :only => [:index]