Merge branch 'master' into improve-delivery-workflow-further

2013-07-13 21:08:50 +02:00 · 2013-07-13 21:08:50 +02:00 · b303b48853
commit b303b48853
parent e5eff07abd 3fd498d29f
32 changed files with 331 additions and 212 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -96,6 +96,8 @@ Foodsoft::Application.routes.draw do
        get :articles_search
        get :fill_new_stock_article_form
      end
+      
+      get :history
    end

    resources :suppliers do