merges master and fixes conflicts

2015-08-17 17:38:34 +02:00
parent 1ffc342079 4a8825cf11
commit 9e1581656a
51 changed files with 579 additions and 60 deletions
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -1,5 +1,4 @@
 class Admin::DashboardController < Admin::BaseController
-  layout 'admin'

  def index
  end