summaryrefslogtreecommitdiff
path: root/app/assets/images/emoji/worried.png
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-01-22 21:16:41 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2017-01-22 21:16:41 +0000
commit8a6e415268c60074b8cd9508c106120107ce5731 (patch)
tree73fc3964bfcefb4244d3e37d4ae5357c3cadd1e7 /app/assets/images/emoji/worried.png
parent52a7112f6673ae73da8aad233b1d63583f221136 (diff)
parent184ba52f1210eda3f3995567f3a53d05ada24b9d (diff)
downloadgitlab-ce-8a6e415268c60074b8cd9508c106120107ce5731.tar.gz
Merge branch 'patch-12' into 'master'
correct the prometheus feature configuration according to https://gitlab.com/git… See merge request !8703
Diffstat (limited to 'app/assets/images/emoji/worried.png')
0 files changed, 0 insertions, 0 deletions