summaryrefslogtreecommitdiff
path: root/lib/api/api.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-02-19 08:11:02 +0000
committerDouwe Maan <douwe@gitlab.com>2016-02-19 08:11:02 +0000
commitad12f11f3ed81637b4d72ce9e494fdbd1f26b1bb (patch)
tree3097d416524866e13efc21bbb9e1c441cac0a9f9 /lib/api/api.rb
parentcb0b7de48267abee85d39571ae55a0e988cc21eb (diff)
parent20fcc5d6f602354fe9d4c1c811496798a053f7ba (diff)
downloadgitlab-ce-ad12f11f3ed81637b4d72ce9e494fdbd1f26b1bb.tar.gz
Merge branch 'rs-emoji' into 'master'
Update Gemojione for new hotness :sparkles: Before | After ------ | ----- ![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png) See merge request !2800
Diffstat (limited to 'lib/api/api.rb')
0 files changed, 0 insertions, 0 deletions