Manually merge changes from webpython branch.

2015-09-15 16:55:16 +02:00
parent db90c9c61f
commit c8253a6ba0
6 changed files with 576 additions and 29 deletions
--- a/2
+++ b/2
@ -33,6 +33,8 @@ gem 'thread_safe'
 gem 'turbolinks'
 gem 'uglifier', '>= 1.3.0'
 gem 'will_paginate', '~> 3.0'
+gem 'tubesock'
+gem 'faye-websocket'

 group :development do
  gem 'better_errors', platform: :ruby