Merge branch 'cs-gemojione-3' into 'master'
Upgrade gemojione to 3.0.0 Upgrades gemojione to 3.0.0, see the Changelog: https://github.com/jonathanwiesel/gemojione/blob/b98aa8b07eef815d4d3f52ff3c8714b28932b0de/CHANGELOG.md#v300-2016-07-12 [Here are all the new 2016 emoji](http://emojione.com/releases/2.2.4/)🎉 This update has new emoji and more sensical categories. See merge request !5237
Showing
... | ... | @@ -223,7 +223,7 @@ gem 'jquery-turbolinks', '~> 2.1.0' |
gem 'addressable', '~> 2.3.8' | ||
gem 'bootstrap-sass', '~> 3.3.0' | ||
gem 'font-awesome-rails', '~> 4.6.1' | ||
gem 'gemojione', '~> 2.6' | ||
gem 'gemojione', '~> 3.0' | ||
gem 'gon', '~> 6.0.1' | ||
gem 'jquery-atwho-rails', '~> 1.3.2' | ||
gem 'jquery-rails', '~> 4.1.0' | ||
... | ... |
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.