Merge 41f92a1 into 864966a

kandanapp · Nov 29, 2014 · 58c6be5 · 58c6be5
2 parents 864966a + 41f92a1
commit 58c6be5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -38,7 +38,7 @@ group :assets do
   gem 'uglifier'
   gem 'bootstrap-sass', '3.1.1.0'
   gem 'sass', '3.2.13'
-  gem 'gemoji'
+  gem 'gemoji', '~> 1.5.0'
 end
 
 group :production do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -309,7 +309,7 @@ DEPENDENCIES
   aws-sdk
   better_errors
   binding_of_caller
-  bootstrap-sass
+  bootstrap-sass (= 3.1.1.0)
   bourbon
   byebug
   cancan
@@ -324,7 +324,7 @@ DEPENDENCIES
   factory_girl_rails
   faker
   faye
-  gemoji
+  gemoji (~> 1.5.0)
   guard
   guard-rspec
   guard-spork