gitlab-org--gitlab-foss/app/assets
Grzegorz Bizon 359d94607c Merge branch 'fix/award-emoji-conflict-in-notes' into 'master'
Fix problems with award-emoji-only comment

This fixes a conflict between note with only a single emoji in content
and award-emojis mechanisms.

Closes #3734 

cc @vsizov

See merge request !1936
2015-12-07 12:26:56 +00:00
..
fonts
images Make icon-link image transparent 2015-12-01 18:20:01 -05:00
javascripts Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' 2015-12-07 12:26:56 +00:00
stylesheets Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' 2015-12-07 12:26:56 +00:00