summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnna Tsyganova <ATSyganova@IBS.RU>2022-07-27 17:08:13 +0300
committerAnna Tsyganova <ATSyganova@IBS.RU>2022-07-27 17:08:13 +0300
commit3b7c83bd9c74b7b1f6c7cbfa79896d2c82f0ceba (patch)
treeccc3271168231cd94e5c2a74cac256c64472da7e
parentc604f17de58a2af80adc525196464ad59bad98ab (diff)
parent8fa8dc95f0b601c3afcae8aed65aae7a267b843b (diff)
parent46d7a1fc16d1a9579fbebab773a74131888a30db (diff)
downloadwebui-vue-3b7c83bd9c74b7b1f6c7cbfa79896d2c82f0ceba.tar.xz
Merge branches 'sila-ui', 'master' and 'sila-ui' of git.sila.ru:pub/openbmc/webui-vue into sila-ui