Merge branch 'master' of https://github.com/Inachos/fetsite

Conflicts: Gemfile.lock config/routes.rb
2015-01-11 22:18:05 +01:00
parent fd20bd5c90 bb3229e826
commit 79ba089b70
45 changed files with 1047 additions and 3 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,9 @@
-Fetsite::Application.routes.draw do
- 
+
+ Fetsite::Application.routes.draw do
+  resources :fetmeetingtops
+
+
+  resources :fetmeetings


  themes_for_rails