Matthew K. Fu JuYuan 09d46f2f75 NCCU 上傳版本 0709 ... Merge branch 'nccu0621' Conflicts: Gemfile config/resque.god vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb		2012-07-09 16:02:59 +08:00
..
locales	orbit disable object for categories	2012-07-05 16:00:45 +08:00
routes.rb	Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working	2012-06-20 14:50:51 +08:00