alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5

This commit is contained in:
Harry Bomrah 2014-12-19 17:15:36 +08:00
parent f9f4224a5b fc184a7cea
commit 0e7e4180a6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/pages_controller.rb
View File

@ -89,8 +89,8 @@ class PagesController < ApplicationController
categories << c categories << c
end end
end end
end
categories = ["all"] if categories.blank? categories = ["all"] if categories.blank?
end
@manifest = @key @manifest = @key
OrbitHelper.set_params params,current_user OrbitHelper.set_params params,current_user
OrbitHelper.set_site_locale locale OrbitHelper.set_site_locale locale