From c3953f62c98cb51596673a48087a1124b7793e51 Mon Sep 17 00:00:00 2001
From: amurrel <amurrel@purdue.edu>
Date: Sat, 6 Sep 2014 20:27:31 -0400
Subject: Run 'bundle update'

---
 Gemfile.lock | 67 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2de3fea..48648a9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,8 +27,6 @@ GEM
       tzinfo (~> 0.3.37)
     arel (4.0.2)
     bcrypt-ruby (3.1.2)
-    bootstrap-sass (3.1.1.1)
-      sass (~> 3.2)
     builder (3.1.4)
     carrierwave (0.10.0)
       activemodel (>= 3.2.0)
@@ -38,18 +36,19 @@ GEM
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.2.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
+    coffee-script-source (1.8.0)
+    commonjs (0.2.7)
     daemons (1.1.9)
-    delayed_job (4.0.1)
+    delayed_job (4.0.3)
       activesupport (>= 3.0, < 4.2)
-    delayed_job_active_record (4.0.1)
+    delayed_job_active_record (4.0.2)
       activerecord (>= 3.0, < 4.2)
       delayed_job (>= 3.0, < 4.1)
     erubis (2.7.0)
-    execjs (2.0.2)
+    execjs (2.2.1)
     figaro (0.7.0)
       bundler (~> 1.0)
       rails (>= 3, < 5)
@@ -59,27 +58,32 @@ GEM
     httparty (0.13.1)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    i18n (0.6.9)
+    i18n (0.6.11)
     jbuilder (1.5.3)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
-    jquery-rails (3.1.0)
+    jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
+    less (2.5.1)
+      commonjs (~> 0.2.7)
+    less-rails (2.5.0)
+      actionpack (>= 3.1)
+      less (~> 2.5.0)
     libv8 (3.16.14.3)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mailboxer (0.11.0)
+    mailboxer (0.12.3)
       carrierwave (>= 0.5.8)
       foreigner (>= 0.9.1)
-      rails (> 3.0.0)
+      rails (>= 3.2.0)
     mime-types (1.25.1)
     minitest (4.7.5)
-    multi_json (1.9.2)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
-    polyglot (0.3.4)
+    polyglot (0.3.5)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -96,22 +100,16 @@ GEM
       activesupport (= 4.0.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.1)
+    rake (10.3.2)
     rdoc (4.1.1)
       json (~> 1.4)
     ref (1.0.5)
-    sass (3.2.19)
-    sass-rails (4.0.3)
-      railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.0)
-      sprockets (~> 2.8, <= 2.11.0)
-      sprockets-rails (~> 2.0)
-    sdoc (0.4.0)
-      json (~> 1.8)
-      rdoc (~> 4.0, < 5.0)
-    simple_captcha2 (0.2.1)
-      rails (>= 3.1)
-    sprockets (2.11.0)
+    sdoc (0.4.1)
+      json (~> 1.7, >= 1.7.7)
+      rdoc (~> 4.0)
+    simple_captcha2 (0.2.2)
+      rails (>= 3.1, < 4.1)
+    sprockets (2.12.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -125,15 +123,20 @@ GEM
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (2.2.2)
+    turbolinks (2.3.0)
       coffee-rails
-    tzinfo (0.3.39)
-    uglifier (2.5.0)
+    twitter-bootstrap-rails (2.2.8)
+      actionpack (>= 3.1)
+      execjs
+      rails (>= 3.1)
+      railties (>= 3.1)
+    tzinfo (0.3.41)
+    uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 
@@ -142,7 +145,6 @@ PLATFORMS
 
 DEPENDENCIES
   bcrypt-ruby (= 3.1.2)
-  bootstrap-sass
   coffee-rails (~> 4.0.0)
   daemons
   delayed_job_active_record
@@ -150,12 +152,13 @@ DEPENDENCIES
   httparty
   jbuilder (~> 1.2)
   jquery-rails
+  less-rails
   mailboxer
   rails (= 4.0.2)
-  sass-rails (~> 4.0.0)
   sdoc
   simple_captcha2
   sqlite3
   therubyracer
   turbolinks
+  twitter-bootstrap-rails
   uglifier (>= 1.3.0)
-- 
cgit v1.2.3