Merge branch 'rs-emoji' into 'master'
Update Gemojione for new hotness✨ Before | After ------ | -----  |  See merge request !2800
Showing
... | ... | @@ -204,7 +204,7 @@ gem 'jquery-turbolinks', '~> 2.1.0' |
gem 'addressable', '~> 2.3.8' | ||
gem 'bootstrap-sass', '~> 3.3.0' | ||
gem 'font-awesome-rails', '~> 4.2' | ||
gem 'gitlab_emoji', '~> 0.2.0' | ||
gem 'gitlab_emoji', '~> 0.3.0' | ||
gem 'gon', '~> 6.0.1' | ||
gem 'jquery-atwho-rails', '~> 1.3.2' | ||
gem 'jquery-rails', '~> 4.0.0' | ||
... | ... |

This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.