Fix conflicts

2015-08-17 21:08:15 +02:00
parent b51354cffb 5b0cd4a8ba
commit 7e1cd2940d
34 changed files with 17572 additions and 2 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -16,6 +16,11 @@ Rails.application.routes.draw do
  end

  resource :account, controller: "account", only: [:show, :update]
+  resource :stats, only: [:show]
+
+  namespace :api do
+    resource :stats, only: [:show]
+  end

  namespace :admin do
    root to: "dashboard#index"