Merge remote-tracking branch 'origin'

2015-01-03 10:54:48 +01:00
parent 3799e5f842 aa080a1eec
commit 81f1db8ff6
81 changed files with 974 additions and 74 deletions
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -1,5 +1,6 @@
 <div class="content-wrap content-column">
- <h1><%= I18n.t('home.willkommen') %></h1></p>
+ <h1><%= I18n.t('home.willkommen') %></h1>
+<%= render partial: "themen/small", object: @starttopic %>
 <div class="container-fluid">
 <div class="row-fluid">
 <div class="span6">
--- a/app/views/home/kontakt.html.erb
+++ b/app/views/home/kontakt.html.erb
@@ -3,8 +3,5 @@
 <% @themen.each do |th| %>
 <%= render partial: "themen/small", object: th %>
 <% end %>
-
-
- 
 
 </div>