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/app/controllers/neuigkeiten_controller.rb
+++ b/app/controllers/neuigkeiten_controller.rb
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-class NeuigkeitenController < ApplicationController
+
+	class NeuigkeitenController < ApplicationController
  before_filter :load_toolbar_elements, :only=>[:show,:find_link]
  before_filter :load_toolbar_elements_edit, :only=>[:edit]