summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/awards.scss
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2018-02-04 23:38:59 +0100
committerMatija Čupić <matteeyah@gmail.com>2018-02-04 23:38:59 +0100
commit3366f377c1d4cbb02ecc5a2e47b059ed375c5e09 (patch)
tree6a19813b4820ad6d2813bf86b30d8e5be2bd10c6 /app/assets/stylesheets/framework/awards.scss
parent0abce36cd20cdd3579138bee835d28519a5593f2 (diff)
parentcf887a8b3108edb715ee5618377f4ffab1824d85 (diff)
downloadgitlab-ce-3366f377c1d4cbb02ecc5a2e47b059ed375c5e09.tar.gz
Merge branch 'master' into 38265-stuckcijobsworker-wrongly-detects-cancels-stuck-builds-when-per-job-timeout-is-more-than-an-hour
Diffstat (limited to 'app/assets/stylesheets/framework/awards.scss')
0 files changed, 0 insertions, 0 deletions