Merge branch 'master' into api-dev-0.18.11

2017-01-04 16:21:32 +01:00
parent b36deb0382 6e5492de22
commit 6445fffc0d
63 changed files with 964 additions and 165 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -149,6 +149,8 @@ Rails.application.routes.draw do
      get :summary, on: :collection
    end

+    resources :signature_sheets, only: [:index, :new, :create, :show]
+
    resources :banners, only: [:index, :new, :create, :edit, :update, :destroy] do
      collection { get :search}
    end