Merge branch 'master' of uflows.com:/var/git/qwaiter

2015-09-30 17:57:36 +02:00
parent 91b5eeec80 6588a97560
commit 53502bcbea
21 changed files with 372 additions and 15 deletions
@@ -113,7 +113,7 @@ Qwaiter::Application.routes.draw do

  # DEVELOPMENT ONLY
  get '/qr' => 'dashboard#qr'
-  get '/demo_both' => 'dashboard#demo_both'
+  get '/demo-both' => 'dashboard#demo_both'
  get :tests, to: 'test_squad#tests' unless Rails.env.production?

  # SUPPLIER