fixes conflicts with master

2015-10-14 15:48:55 +02:00
parent 68b866171b 77bacdc3ec
commit e08ed41e98
63 changed files with 1394 additions and 1677 deletions
--- a/app/views/admin/stats/show.html.erb
+++ b/app/views/admin/stats/show.html.erb
@@ -80,12 +80,12 @@
      </div>

      <div class="small-12 medium-6 left">
-        <h2><%= t "admin.stats.show.combined_title" %></h2>
+        <h2><%= t "admin.stats.show.visits_title" %></h2>
        <%= visits_chart_tag id: "visits" %>
      </div>

      <div class="small-12 medium-6 left">
-        <h2><%= t "admin.stats.show.visits_title" %></h2>
+        <h2><%= t "admin.stats.show.combined_title" %></h2>
        <%= events_chart_tag @event_types.keys, id: 'combined' %>
      </div>