Permalink
Browse files

Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile
	Gemfile.lock
  • Loading branch information...
2 parents d5ace2f + f668c5e commit 73d4bd5a11fb5ebaecf6e51fbc7ac2d6dd5b8635 @treeder treeder committed May 11, 2012
Showing with 0 additions and 1 deletion.
  1. +0 −1 Gemfile
View
@@ -2,7 +2,6 @@ source 'http://rubygems.org'
gem 'rest-client'
gem 'rest'
-#gem 'json'
gem 'bundler', '> 1.0.0'
group :development do

0 comments on commit 73d4bd5

Please sign in to comment.