diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-06 10:09:26 +0100 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-06 10:09:26 +0100 |
commit | 9e2b996f32b47c4714543d7c74fc815893da68cf (patch) | |
tree | a544536ee7cb804b354301e144c2690117699a9c /lib/gitlab/current_settings.rb | |
parent | 797e758beb882d67f32b87db6453cad41c0b931f (diff) | |
parent | c6c9b37b1d1c9304b0eef530adb4d32178adae16 (diff) | |
download | gitlab-ce-9e2b996f32b47c4714543d7c74fc815893da68cf.tar.gz |
Merge remote-tracking branch 'origin/38464-k8s-apps' into 36629-35958-add-cluster-application-section
Diffstat (limited to 'lib/gitlab/current_settings.rb')
0 files changed, 0 insertions, 0 deletions