diff app/controllers/.svn/text-base/calendars_controller.rb.svn-base @ 41:7f0e922c8982 luisf

merged with new version from trunk
author luisf
date Fri, 19 Nov 2010 14:45:28 +0000
parents 94944d00e43c
children cbce1fd3b1b7
line wrap: on
line diff
--- a/app/controllers/.svn/text-base/calendars_controller.rb.svn-base	Thu Nov 18 17:50:11 2010 +0000
+++ b/app/controllers/.svn/text-base/calendars_controller.rb.svn-base	Fri Nov 19 14:45:28 2010 +0000
@@ -8,6 +8,8 @@
   helper :projects
   helper :queries
   include QueriesHelper
+  helper :sort
+  include SortHelper
 
   def show
     if params[:year] and params[:year].to_i > 1900