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

info ...

Browse Source
This commit is contained in:
Andreas Stephanides
2013-11-11 20:42:07 +01:00
parent d4b7446cdb
commit 0bb8460ca4
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile.lock
View File

@@ -105,14 +105,11 @@ GEM
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)