Merge branch 'master' into dashboard-master

2018-10-19 01:48:37 +02:00
parent 5bb9225c52 3878946c9e
commit 546105d989
1586 changed files with 126348 additions and 9884 deletions
--- a/app/views/admin/dashboard/index.html.erb
+++ b/app/views/admin/dashboard/index.html.erb
@@ -1,9 +1,3 @@
-<div class="float-right">
-  <%= link_to root_path do %>
-    <%= t("admin.dashboard.index.back", org: setting['org_name']) %>
-  <% end %>
-</div>
-
 <h2 class="title inline-block"><%= t("admin.dashboard.index.title") %></h2>

 <p><%= t("admin.dashboard.index.description", org: setting['org_name']) %></p>