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

Conflicts: app/controllers/neuigkeiten_controller.rb config/routes.rb
2014-08-27 15:31:52 +02:00
parent 360f6880fe 585b386e7c
commit bb3229e826
46 changed files with 1053 additions and 2 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]