summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-02-24 02:50:45 +0000
committerRobert Speicher <robert@gitlab.com>2016-02-24 02:50:45 +0000
commitdba47f680d1716a0e5d96809522301ed3400e396 (patch)
tree0105e9cba593d3196e94831d4179226355e7c4fc /Gemfile.lock
parent9f80118e05e68743d95a83742a1d0a06bba3039c (diff)
parent476a8049691951c4e1259cdbb164bbf1fca2bd1e (diff)
downloadgitlab-ce-dba47f680d1716a0e5d96809522301ed3400e396.tar.gz
Merge branch 'issue_13301_emoji-menu' into 'master'
Load award emoji picker with ajax request Fixes #13301. See merge request !2888
Diffstat (limited to 'Gemfile.lock')
0 files changed, 0 insertions, 0 deletions