gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 8e444fcd88 into 53a30439ca

Browse source
This commit is contained in:
Christian Bruckmayer 2014-07-08 07:19:25 +00:00
commit 91d749bcff
9 changed files with 556 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Gemfile.lock
View file

@ -75,6 +75,7 @@ GEM
nio4r (>= 0.5.0)
chart-js-rails (0.0.6)
railties (> 3.1)
chronic (0.10.2)
climate_control (0.0.3)
activesupport (>= 3.0)
cliver (0.3.2)
@ -378,6 +379,9 @@ GEM
warden (1.2.3)
rack (>= 1.0)
websocket-driver (0.3.3)
whenever (0.9.2)
activesupport (>= 2.3.4)
chronic (>= 0.6.3)
xpath (2.0.0)
nokogiri (~> 1.3)
yajl-ruby (1.2.0)
@ -440,3 +444,4 @@ DEPENDENCIES
transitions
turbolinks
uglifier (>= 1.3.0)
whenever