consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing conflicts [#6]

Browse Source
This commit is contained in:
rgarcia
2015-07-16 21:29:44 +02:00
parent e88832b5a3 f09f7a17c2
commit 75f1638cd6
23 changed files with 446 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Gemfile.lock
View File

@@ -68,6 +68,11 @@ GEM
diff-lcs (1.2.5)
erubis (2.7.0)
execjs (2.5.2)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.5.0)
factory_girl (~> 4.5.0)
railties (>= 3.0.0)
foundation-rails (5.5.2.1)
railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5)
@@ -187,10 +192,12 @@ DEPENDENCIES
capybara
coffee-rails (~> 4.1.0)
devise
factory_girl_rails
foundation-rails
jbuilder (~> 2.0)
jquery-rails
rails (= 4.2.3)
responders
rspec-rails (~> 3.0)
sass-rails (~> 5.0)
sdoc (~> 0.4.0)