diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2017-08-17 21:03:36 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2017-08-17 21:03:36 +0000 |
commit | 105759982e6226d244a08b77703354251480ea9b (patch) | |
tree | 6f2c16b347b62b9ef176c059577dc08d3644fe4e /lib/api/notes.rb | |
parent | 5a332c5974dcea7177cd3ad89c494fa9ba62880f (diff) | |
parent | d844d976663ca579661e62f2aead44e8cbecbf7d (diff) | |
download | gitlab-ce-105759982e6226d244a08b77703354251480ea9b.tar.gz |
Merge branch '36448-smiles-are-broken-in-9-5-0-rc2' into 'master'
Fixes the blown up emoji problem in notes
Closes #36448 and #36282
See merge request !13632
Diffstat (limited to 'lib/api/notes.rb')
0 files changed, 0 insertions, 0 deletions