fixes conflicts with master [#25]

2015-08-05 13:47:23 +02:00
parent c2e7ff32b1 715ee61979
commit fa5b678b69
48 changed files with 1036 additions and 2095 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -70,4 +70,8 @@ Rails.application.routes.draw do
  #     # (app/controllers/admin/products_controller.rb)
  #     resources :products
  #   end
+
+  if Rails.env.development?
+    mount LetterOpenerWeb::Engine, at: "/letter_opener"
+  end
 end