Merge remote-tracking branch 'origin/szzh' into szzh
This commit is contained in:
commit
b4f99c75da
|
@ -20,7 +20,7 @@ class WelcomeController < ApplicationController
|
||||||
include WelcomeHelper
|
include WelcomeHelper
|
||||||
helper :project_score
|
helper :project_score
|
||||||
caches_action :robots
|
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 :fake, :only => [:index, :course]
|
||||||
before_filter :entry_select, :only => [:index]
|
before_filter :entry_select, :only => [:index]
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue