Merge branch 'master' of github.com:kyledrake/neocities-web

This commit is contained in:
Kyle Drake 2014-04-05 09:50:07 -07:00
commit f7d394d12c

View file

@ -135,9 +135,9 @@ GEM
sequel (>= 3.39.0) sequel (>= 3.39.0)
shotgun (0.9) shotgun (0.9)
rack (>= 1.0) rack (>= 1.0)
sidekiq (2.17.7) sidekiq (3.0.0)
celluloid (>= 0.15.2) celluloid (>= 0.15.2)
connection_pool (>= 1.0.0) connection_pool (>= 2.0.0)
json json
redis (>= 3.0.6) redis (>= 3.0.6)
redis-namespace (>= 1.3.1) redis-namespace (>= 1.3.1)