summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-15 22:39:32 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-06-15 22:39:32 +0000
commit433e0a41cba9ad15269208b8bb92462180b17306 (patch)
tree7ee0d231eab19259106a54b5dc7df1d1a81b18ed /app/models
parent102f4d8dd748e9caaa11a40b29396a7c599226aa (diff)
parentbcc3f8f237f5cf2b64088564637f8bb22d3522c8 (diff)
downloadgitlab-ce-433e0a41cba9ad15269208b8bb92462180b17306.tar.gz
Merge branch 'award-emoji-fix' into 'master'
Fix emoji block selector. Fixes #18465 and #18577 See merge request !4604
Diffstat (limited to 'app/models')
0 files changed, 0 insertions, 0 deletions