andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/fetsite/fetsite

Browse Source 
Conflicts:
	Gemfile.lock
This commit is contained in:
Andreas Stephanides
2013-11-11 20:04:08 +01:00
parent f3288d5b69 d314a81268
commit ae99841306
9 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Gemfile.lock
View File

@@ -100,11 +100,19 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.21)
mini_portile (0.5.2)
multi_json (1.5.1)
multipart-post (1.2.0)
mysql2 (0.3.13)
net-ldap (0.2.2)
<<<<<<< HEAD
nokogiri (1.5.6)
=======
nokogiri (1.6.0)
mini_portile (~> 0.5.0)
nokogiri (1.6.0-x86-mingw32)
mini_portile (~> 0.5.0)
>>>>>>> d314a8126862e76d94c84a289a8883167b58a001
oauth2 (0.8.1)
faraday (~> 0.8)
httpauth (~> 0.1)
@@ -176,8 +184,8 @@ GEM
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rubyntlm (0.1.1)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
sanitize (2.0.6)
nokogiri (>= 1.4.4)
sass (3.2.5)
sass-rails (3.2.6)
railties (~> 3.2.0)