Merge branch 'develop' into purge-requests

Conflicts:
	spec/controllers/request_controller_spec.rb

1 files changed, 0 insertions, 26 deletions

diff --git a/vendor/gems/json-1.5.1/install.rb b/vendor/gems/json-1.5.1/install.rb
deleted file mode 100755
index adf77a0d0..000000000
--- a/vendor/gems/json-1.5.1/install.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rbconfig'
-require 'fileutils'
-include FileUtils::Verbose
-
-include Config
-
-bindir = CONFIG["bindir"]
-cd 'bin' do
-  filename = 'edit_json.rb'
-  #install(filename, bindir)
-end
-sitelibdir = CONFIG["sitelibdir"]
-cd 'lib' do
-  install('json.rb', sitelibdir)
-  mkdir_p File.join(sitelibdir, 'json')
-  for file in Dir['json/**/*.{rb,xpm}']
-    d = File.join(sitelibdir, file)
-    mkdir_p File.dirname(d)
-    install(file, d)
-  end
-  install(File.join('json', 'editor.rb'), File.join(sitelibdir,'json'))
-  install(File.join('json', 'json.xpm'), File.join(sitelibdir,'json'))
-end
-warn " *** Installed PURE ruby library."