summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2015-12-11 12:39:56 +0000
committerValery Sizov <valery@gitlab.com>2015-12-11 12:39:56 +0000
commit2029be038b1a7f960f11b51511e081a1a8337d98 (patch)
tree18faa50e9d67746be474577f395c720ff49df81b /lib/api
parentcd97dba2a9a26e83818f7e111bc0b0185a7ced8a (diff)
parent72b7d1f59d4fb26fb9119c5a059528f0fc951904 (diff)
downloadgitlab-ce-2029be038b1a7f960f11b51511e081a1a8337d98.tar.gz
Merge branch 'emoji_aliases' into 'master'
Emoji aliases problem Fixes #3850 See merge request !2064
Diffstat (limited to 'lib/api')
0 files changed, 0 insertions, 0 deletions