Author: assaf
Date: Thu May 15 17:02:24 2008
New Revision: 656896
URL: http://svn.apache.org/viewvc?rev=656896&view=rev
Log:
Merge branch 'activity'
Conflicts:
config/routes.rb
Modified:
ode/sandbox/singleshot/config/routes.rb
Modified: ode/sandbox/singleshot/config/routes.rb
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/config/routes.rb?rev=656896&r1=656895&r2=656896&view=diff
==============================================================================
--- ode/sandbox/singleshot/config/routes.rb (original)
+++ ode/sandbox/singleshot/config/routes.rb Thu May 15 17:02:24 2008
@@ -1,7 +1,7 @@
ActionController::Routing::Routes.draw do |map|
map.resource 'session'
- map.resources 'tasks', :collection=>{ 'following'=>:get, 'completed'=>:get,
'feed'=>:get, 'ical'=>:get }
+ map.resources 'tasks', :collection=>{ 'following'=>:get, 'completed'=>:get }
map.resource 'activity'
map.root :controller=>'tasks'
map.resource 'sandwich'
