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

Merge with master

Browse source
This commit is contained in:
Chrisbr 2014-05-12 15:26:18 +02:00
commit d97e3603b1
8 changed files with 125 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Gemfile.lock
View file

@ -252,6 +252,12 @@ GEM
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0)
shoulda (3.5.0)
shoulda-context (~> 1.0, >= 1.0.1)
shoulda-matchers (>= 1.4.1, < 3.0)
shoulda-context (1.2.1)
shoulda-matchers (2.6.1)
activesupport (>= 3.0.0)
simplecov (0.8.2)
docile (~> 1.1.0)
multi_json
@ -335,6 +341,7 @@ DEPENDENCIES
rspec (>= 3.0.0.beta)
rspec-rails (>= 3.0.0.beta)
sass-rails (>= 4.0.2)
shoulda
spring-commands-rspec
sqlite3
transitions