summaryrefslogtreecommitdiff
path: root/fixtures
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-06-28 05:51:30 +0000
committerTim Zallmann <tzallmann@gitlab.com>2017-06-28 05:51:30 +0000
commit08ad0af49c017d740b43588c0809b3811d25a448 (patch)
treeb6dbccf4e0c62bd4a8bc79e51934f008122cbe17 /fixtures
parenta7f114b1368fd11dba036f67b2ef66c2bf39f02a (diff)
parent88e12ac94b13bc4ee57a60adca64af5cf7d14030 (diff)
downloadgitlab-ce-08ad0af49c017d740b43588c0809b3811d25a448.tar.gz
Merge branch 'refactor-emoji-utils' into 'master'
Refactor emoji helpers in preparation for async loading See merge request !12432
Diffstat (limited to 'fixtures')
0 files changed, 0 insertions, 0 deletions