summaryrefslogtreecommitdiff
path: root/lib/api/files.rb
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2015-12-24 13:58:49 +0000
committerValery Sizov <valery@gitlab.com>2015-12-24 13:58:49 +0000
commitd84ca3e81530415e7d3c03c8cf7a8db5071b0bcb (patch)
tree47a5860fda0cd6fd0665851886afe3368015e7ad /lib/api/files.rb
parent1f9633d67ce85443346847b64f7cc17d0ca8f8d0 (diff)
parent44cf1cbaafa3be1c284f202dcc67c734bbba1a8e (diff)
downloadgitlab-ce-d84ca3e81530415e7d3c03c8cf7a8db5071b0bcb.tar.gz
Merge branch 'emoji-picker-search' into 'master'
Emoji picker search depend on !2172 Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/3576 !!! Should be merged after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2198 ![Screenshot_2015-12-23_11.44.57](/uploads/01da0b62c3c234307142e2c4db68e53f/Screenshot_2015-12-23_11.44.57.png) See merge request !2186
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions