Merge remote-tracking branch 'hausdorff/master'

2013-08-13 19:25:26 +02:00
parent ea967240a5 c7d63c4c19
commit 235cc4094e
111 changed files with 2391 additions and 30 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -46,6 +46,10 @@
     resources :home, :only=>[:index]
     get 'home/dev', :controller=>:home, :action=>:dev, :as=>'home_dev'
     resources :beispiele
+     resources :themen
+	 resources :themengruppen do
+	 resources :themen, :only=>[:new, :show]
+	 end
 
  resources :calendars
  resources :calentries