Strom:
7b472c887f
2.8-disable-adjustment-prediction
AjayTripathy-add-metrics-whitelist
AjayTripathy-alibaba-improvements
AjayTripathy-allocation-hardening
AjayTripathy-change-azure-defaults
AjayTripathy-fix-csv-casing
AjayTripathy-fix-float-testing-issues
AjayTripathy-fix-gpucost
AjayTripathy-fix-gpucost-2-cherrypick
AjayTripathy-fix-scaleway-panic
AjayTripathy-gpu-slicing
AjayTripathy-onprem-hardening-106
AjayTripathy-remove-log
AjayTripathy-resource-quota
AjayTripathy-resource-quota-2.8
alex-stringbank-experiment
atm/add-compression
atm/add-scrape-configc
atm/add-warwick-maintainer
atm/enable-cd-IV
atm/enable-cd-VI
atm/fix-asset-json
atm/fix-pb
atm/rm-cliff
atm/stack-building
atm/stack-building-II
atm/streaming-storage-spike
atm/test-code-cov-II
atm/trim-memory-usage
bolt/allocation-property
bolt/azure-stream-reader
bolt/block-cache-warm
bolt/buffer-symmetry-fix
bolt/custom-prom-metric-fields
bolt/default-collector-storage
bolt/opencost-build-fixes
bolt/opencost-core
bolt/opencost-mods
bolt/prom-query-logs
bolt/remove-provider-id-requirement
bump-go-toolchain-1.23.5
cache-optimization
cdp/build-and-publish-release-fix
cdp/pod-count-fix
cdp/sbom-fix
cdp/sign-image-start-time-fix
cdp/test-integration-tests
cdp/uid-bug-fix
claude/copilot-testing-requests-oe53U
claude/determined-cannon-spwz1y
claude/document-mcp-support-01GLSH743KWizwc1P6yRxwxM
claude/enhance-nodepricing-logging-63G1M
claude/envoy-gateway-analysis-EDRs2
claude/fix-nil-pointer-dereference-SHAiq
claude/fix-opencast-prometheus-tests-01Vu5mxtb3rqbpP2KaFwJw4c
claude/github-issue-review-qdjfph
claude/investigate-nebius-provider-YVkoo
claude/migrate-agents-standard-01BpVX9bvDWkz72nEoqB1kHA
claude/opencost-issue-3923-vt92g3
claude/opencost-security-alert-hmaC8
claude/patch-CVE-2026-33252-Go0UF
claude/prometheus-node-pricing-metrics-fbwKq
claude/review-configmap-watcher-McWxe
claude/review-issue-01SRGWhn6ZQFNoJAUxu3vQ6i
claude/review-opencost-3530-Plght
claude/review-opencost-3620-EQ76R
claude/review-opencost-pr-3510-QH5qi
claude/review-supply-chain-improvements-011CUuF7dFnBdAbtMXxKrwDN
claude/secure-bill-of-materials-011CV4L7f7X28t8xeuLGhTFz
claude/security-vulnerability-review-7hkomd
claude/test-opencost-issue-3388-01P3WHJfr8bKi3DWpMNx41ae
claude/work-in-progress-01LZ7rJxTLH5TQzKB3AW7R2s
cliffcolvin-patch-1
cliffcolvin-patch-2
collections
cp-2.5-changes
cursor/align-weekly-step-to-monday-c5f4
cursor/fix-max-usage-overwrite-5d65
cursor/fix-pr-3706-gofmt-5d65
cursor/propose-integration-test-flake-fix-5d65
dedup-allocation-logs
dependabot/github_actions/actions/cache-6
dependabot/github_actions/actions/checkout-7
dependabot/github_actions/extractions/setup-just-4
dependabot/github_actions/guibranco/github-status-action-v2-1.2.0
dependabot/github_actions/tspascoal/get-user-teams-membership-4
dependabot/go_modules/cloud.google.com/go/storage-1.62.2
dependabot/go_modules/core/cloud.google.com/go/storage-1.61.3
dependabot/go_modules/core/github.com/aws/aws-sdk-go-v2-1.41.4
dependabot/go_modules/core/github.com/aws/aws-sdk-go-v2/config-1.32.12
dependabot/go_modules/core/github.com/minio/minio-go/v7-7.0.99
dependabot/go_modules/core/go_modules-a978bc362c
dependabot/go_modules/core/google.golang.org/api-0.272.0
dependabot/go_modules/github.com/Azure/azure-sdk-for-go/sdk/azcore-1.21.1
dependabot/go_modules/github.com/go-playground/validator/v10-10.30.2
dependabot/go_modules/github.com/modelcontextprotocol/go-sdk-1.2.0
dependabot/go_modules/go_modules-b913a45371
dependabot/go_modules/golang.org/x/oauth2-0.36.0
dependabot/go_modules/modules/collector-source/github.com/stretchr/testify-1.12.1
dependabot/go_modules/modules/collector-source/go_modules-a978bc362c
dependabot/go_modules/modules/collector-source/k8s.io/api-0.36.3
dependabot/go_modules/modules/collector-source/k8s.io/apimachinery-0.37.0
dependabot/go_modules/modules/collector-source/k8s.io/kubelet-0.36.4
dependabot/go_modules/modules/pricing/basic/go_modules-c97781ea4a
dependabot/go_modules/modules/prometheus-source/github.com/Masterminds/semver/v3-3.5.0
dependabot/go_modules/modules/prometheus-source/github.com/prometheus/client_golang-1.24.0
dependabot/go_modules/modules/prometheus-source/github.com/rs/zerolog-1.35.0
dependabot/go_modules/modules/prometheus-source/go_modules-57bd245098
dependabot/go_modules/modules/prometheus-source/k8s.io/client-go-0.36.2
develop
feature/kubemodel
feature/resourcequotas-2
fix-cve-2025-22871-cve-2025-22872
kc-0.0
kc-2.5
kc-2.6
kc-2.7
kc-2.8
kc-2.9
kc-3.0
kc-3.1
kc-3.2
kubemodel-proposal
mattray-patch-1
mattray-patch-2
memtest
memusage
niko-3630
niko-ENG-2686-agent-provider-order
niko-fix-local-storage-cost
niko/2.8-ecp-provider-id-fix
niko/empty-filter
niko/meta
niko/ng-sizing
niko/node-group-analysis
opencost-workflow-fix
openssf-scanning
peatey/feat/currency-conversion-backend
peatey/feat/spot-price-history-fallback
peatey/investigate-opencost-3725-BgOlV
plugin-working-branch
pr-gpu-kubemodel-device
pr-gpu-saturation-core
pr-gpu-saturation-datapaths
rc-timeout
revert-2316-revert-1861-optional-scrape-endpoint
revert-2583-fix-workflow-109
revert-2725-optimizemem
revert-2903-bump-deps-cve-resolution
revert-3267-revert-3234-sth/etl-clean-up
sean/cloudcost-view-labels
sean/gcp-amortization
skunkworks-II
sth/KCM-5744
sth/cloud-cost-clean-up
sth/helm-chart-refactor
sth/kcm-6147
sth/kubemodel-bug-fixes
update-go-version-20260319-151109
update-go-version-20260330-143938
v1.106
v1.107
v1.108
v1.109
v1.110
v1.111
v1.112
v1.113
v1.114
v1.114-lts
v1.115
v1.117
v2.0
v2.1
v2.2
v2.3
v2.3-patch/atm/eng-239-budgets
v2.3-pick-2846
v2.4
v2.5
v2.6
v3.1
v3.1-patch-data-defragment
modules/pricing/public/v1.0.3
modules/pricing/public/v1.0.2
modules/pricing/public/v1.0.1
modules/pricing/public/v1.0.0
modules/prometheus-source/v1.121.1
modules/collector-source/v1.121.1
core/v1.121.1
v1.121
v1.121.1
modules/prometheus-source/v1.121.0
modules/collector-source/v1.121.0
core/v1.121.0
v1.121.0
modules/prometheus-source/v1.120.4
modules/collector-source/v1.120.4
core/v1.120.4
v1.120
v1.120.4
modules/prometheus-source/v1.120.3
modules/collector-source/v1.120.3
core/v1.120.3
v1.120.3
kc-3.1.8
kc-3.1.8-rc.0
modules/prometheus-source/v1.120.2
modules/collector-source/v1.120.2
core/v1.120.2
v1.120.2
kc-3.2.0
kc-3.2.0-rc.0
kc-3.2.0-rc.1
kc-3.2.0-rc.2
kc-3.2.0-rc.3
kc-3.2.1
kc-3.2.1-rc.2
kc-3.2.1-rc.4
kc-3.1.7
kc-3.1.7-rc.1
modules/prometheus-source/v1.120.1
modules/collector-source/v1.120.1
core/v1.120.1
v1.120.1
modules/prometheus-source/v1.120.0
modules/collector-source/v1.120.0
core/v1.120.0
v1.120.0
kc-3.1.4
kc-3.1.4-rc.4
kc-3.1.4-rc.5
kc-3.1.4-rc.6
kc-3.1.5
kc-3.1.5-rc.0
kc-3.1.6
kc-3.1.7-rc.0
v1.119.2
modules/prometheus-source/v1.119.2
modules/collector-source/v1.119.2
core/v1.119.2
v1.119
kc-3.1.4-rc.2
kc-3.1.4-rc.3
kc-2.8.6
kc-2.8.7
kc-3.1.1
kc-3.1.2
kc-3.1.2-rc.0
kc-3.1.3
kc-3.1.3-rc.0
kc-3.1.3-rc.1
kc-3.1.3-rc.2
kc-3.1.4-rc.0
kc-3.1.4-rc.1
modules/prometheus-source/v1.119.1
modules/collector-source/v1.119.1
core/v1.119.1
v1.119.1
kc-3.1.0
kc-3.1.0-rc.0
modules/prometheus-source/v1.119.0
modules/collector-source/v1.119.0
core/v1.119.0
v1.119.0
modules/prometheus-source/v1.118.1
modules/collector-source/v1.118.1
core/v1.118.1
v1.118.1
kc-3.0.4
kc-3.0.4-rc.1
kc-3.0.5
kc-3.0.5-rc.0
kc-3.0.5-rc.1
kc-3.0.5-rc.2
kc-3.0.6
kc-3.0.6-rc.0
kc-3.0.6-rc.1
kc-3.0.6-rc.2
kc-2.9.7
modules/prometheus-source/v1.118.0
modules/collector-source/v1.118.0
core/v1.118.0
v1.118.0
v1.118
kc-3.0.3
kc-3.0.3-rc.0
kc-3.0.3-rc.1
kc-3.0.4-rc.0
kc-3.0.1
kc-3.0.2
modules/prometheus-source/v1.117.6
modules/collector-source/v1.117.6
v1.117
core/v1.117.6
v1.117.6
modules/prometheus-source/v1.117.5
modules/collector-source/v1.117.5
core/v1.117.5
v1.117.5
kc-3.0.0
kc-3.0.0-rc.5
kc-3.0.0-rc.6
core/v1.117.4
modules/collector-source/v1.117.4
modules/prometheus-source/v1.117.4
kc-3.0.0-rc.3
kc-3.0.0-rc.4
v1.117.4
kc-3.0.0-rc.0
kc-3.0.0-rc.1
kc-3.0.0-rc.2
kc-3.0.0-test
kc-3.0.0-test1
kc-3.0.0-test2
core/v1.117.3
modules/collector-source/v1.117.3
modules/prometheus-source/v1.117.3
v1.117.3
core/v1.117.2
kc-3.0.0-test.0
modules/collector-source/v1.117.2
modules/prometheus-source/v1.117.2
v1.117.2
v1.117.1
core/v1.117.1
modules/collector-source/v1.117.1
modules/prometheus-source/v1.117.1
v1.117.0
core/v1.117.0
modules/collector-source/v1.117.0
modules/prometheus-source/v1.117.0
v1.116
v1.116.0
kc-2.8.0
kc-2.8.0-rc.7
kc-2.8.1
kc-2.8.1-rc.0
kc-2.8.1-rc.1
kc-2.8.2
kc-2.8.2-rc.0
kc-2.8.3
kc-2.8.3-rc.0
kc-2.8.4
kc-2.8.5
kc-2.8.5-rc.0
kc-2.8.5-rc.1
kc-2.8.5-rc.2
kc-2.8.5-rc.3
kc-2.7.3-rc.0
kc-2.8.0-rc.6
kc-2.8.0-rc.5
kc-2.8.0-rc.4
v1.115.0
kc-2.8.0-rc.1
kc-2.8.0-rc.2
kc-2.8.0-rc.3
kc-2.8.0-test
kc-2.8.0-rc.0
kc-2.7.1
kc-2.7.1-rc.0
kc-2.7.1-rc.1
kc-2.7.2
kc-2.7.2-rc.0
kc-2.7.2-rc.1
kc-2.7.2-rc.2
kc-2.7.2-rc.3
kc-2.7.2-rc.4
kc-2.7.2-rc.5
kc-2.7.0
kc-2.7.0-rc.0
kc-2.7.0-rc.1
kc-2.7.0-rc.2
kc-2.5.4
kc-2.5.4-rc.3
kc-2.5.4-rc.4
kc-2.5.5
kc-2.5.5-rc.0
kc-2.5.5-rc.1
kc-2.5.5-rc.2
kc-2.6.0
kc-2.6.0-rc.1
kc-2.6.0-rc.2
kc-2.6.0-rc.3
kc-2.6.0-rc.4
kc-2.6.0-rc.5
kc-2.6.0-rc.6
kc-2.6.0-rc.7
kc-2.6.1
kc-2.6.1-rc.0
kc-2.6.1-rc.1
kc-2.6.1-rc.2
kc-2.6.2
kc-2.6.2-rc.0
kc-2.6.2-rc.1
kc-2.6.3
kc-2.6.3-rc.2
kc-2.6.4
kc-2.6.4-rc.0
kc-2.6.5
kc-2.6.5-rc.0
kc-2.6.5-rc.1
v2.6.0-rc.0
v1.114.0
v2.5.2
v2.5.2-rc.2
v2.5.2-rc.3
v2.5.3
v2.5.3-rc.0
v2.5.3-rc.1
v2.5.4-rc.1
v2.5.4-rc.2
v2.5.0
v2.5.0-rc.2
v2.5.0-rc.3
v2.5.0-rc.4
v2.5.1
v2.5.1-rc.0
v2.5.1-rc.1
v2.5.1-rc.2
v2.5.2-rc.0
v2.5.2-rc.1
v2.4.3
v2.4.3-rc.0
v2.4.4-rc.0
v1.113.0
v2.5.0-rc.0
v2.5.0-rc.1
v1.112.1
v2.4.2
v1.112.0
v2.4.0
v2.4.0-rc.4
v2.4.0-rc.5
v2.4.0-rc.6
v2.4.1
v2.4.1-rc.0
v2.4.1-rc.1
v2.4.2-rc.0
v2.4.2-rc.1
v2.4.0-rc.1
v2.4.0-rc.2
v2.4.0-rc.3
v2.3.5
v2.3.5-rc.10
v2.3.5-rc.4
v2.3.5-rc.5
v2.3.5-rc.6
v2.3.5-rc.7
v2.3.5-rc.8
v2.3.5-rc.9
v2.4.0-rc.0
v2.3.5-rc.1
v2.3.5-rc.2
v2.3.5-rc.0
v2.3.3
v2.3.3-rc.0
v2.3.4
v2.3.4-rc.0
v2.3.4-rc.1
v2.3.2
v2.3.2-rc.2
v2.3.2-rc.3
v2.3.2-rc.4
v1.111.0
v2.3.2-rc.0
v2.3.2-rc.1
v2.3.0
v2.3.0-rc.10
v2.3.0-rc.11
v2.3.0-rc.3
v2.3.0-rc.4
v2.3.0-rc.5
v2.3.0-rc.6
v2.3.0-rc.7
v2.3.0-rc.8
v2.3.0-rc.9
v2.3.1
v2.3.1-rc.1
v2.3.1-rc.2
v2.3.1-rc.3
v2.3.0-rc.2
v2.3.0-rc.1
v2.2.5
v2.2.5-rc.0
v2.2.6-rc.0
v2.2.6-rc.1
v2.1.2
v2.1.2-rc.4
v2.3.0-rc.0
v2.2.4
v2.2.4-rc.0
v1.110
v2.2.2
v2.2.3
v2.2.3-rc.0
v2.2.3-rc.1
v2.2.3-rc.2
v2.2.3-rc.3
v2.2.3-rc.4
v2.2.1
v2.2.1-rc.1
v2.2.2-rc.0
v2.2.2-rc.1
v2.2.1-rc.0
v2.2.0
v2.2.0-rc.6
v2.2.0-rc.7
v2.2.0-rc.4
v2.2.0-rc.5
v2.2.0-rc.3
v2.2.0-rc.0
v2.2.0-rc.1
v2.2.0-rc.2
v1.109.0
v2.1.1
v2.1.1-rc.0
v2.1.1-rc.1
v2.1.1-rc.2
v2.1.2-rc.0
v2.1.2-rc.1
v2.1.2-rc.2
v2.1.2-rc.3
v2.1.0
v2.1.0-rc.6
v1.109
v1.106.8-rc.3
v1.106.8-rc.4
v1.106.8-rc.2
v1.106.8-rc.1
v1.106.8-rc.0
v2.1.0-rc.0
v2.1.0-rc.1
v2.1.0-rc.2
v2.1.0-rc.3
v2.1.0-rc.4
v2.1.0-rc.5
v2.0.2
v2.0.2-rc.0
v2.0.2-rc.1
v2.0.1
v2.0.1-rc.0
v2.0.1-rc.1
v2.0.0
v2.0.0-RC.4
v2.0.0-rc.2
v2.0.0-rc.3
v2.0.0-rc.0
v2.0.0-rc.1
v1.108.1
v1.108.1-rc.0
v1.108.1-rc.1
v1.108.1-rc.2
v1.108.1-rc.3
v1.108.0
v1.108.0-rc.10
v1.108.0-rc.11
v1.108.0-rc.12
v1.108.0-rc.13
v1.108.0-rc.3
v1.108.0-rc.4
v1.108.0-rc.5
v1.108.0-rc.6
v1.108.0-rc.7
v1.108.0-rc.8
v1.108.0-rc.9
v1.108.0-rc.2
v1.106.5
v1.106.5-rc.1
v1.106.6
v1.106.7
v1.106.5-rc.0
v1.107.1
v1.107.1-rc.1
v1.107.0
v1.107.0-rc.2
v1.107.0-rc.3
v1.107.1-rc.0
v1.106.4
v1.106.4-rc.2
v1.106.4-rc.3
v1.106.4-rc.4
v1.106.4-rc.5
v1.107.0-rc.1
v1.107.0-rc.0
v0.0.1-actdev.2
v0.0.1-depotprodtestrun.1
v1.106.3
v1.106.3-rc.0
v1.106.4-rc.0
v1.106.4-rc.1
v1.106.1
v1.106.1-rc.0
v1.106.2
v1.106.0
v1.106.0-rc.15
v1.106.0-rc.16
v1.106.0-rc.12
v1.106.0-rc.13
v1.106.0-rc.14
v1.106.0-rc.11
v1.105.2
v1.105.2-rc.0
v1.105.2-rc.1
v1.106.0-rc.10
v1.106.0-rc.8
v1.106.0-rc.9
v1.106.0-rc.7
v1.106.0-rc.6
v1.106.0-rc.3
v1.106.0-rc.4
v1.106.0-rc.5
v1.106.0-rc.2
v1.106.0-rc.0
v1.106.0-rc.1
v1.105.0
v1.105.0-rc.10
v1.105.0-rc.8
v1.105.0-rc.9
v1.105.1
v1.105.1-rc.0
v1.105.1-rc.1
v1.105.1-rc.2
v1.105.0-rc.7
v1.105.0-rc.6
v1.105.0-rc.5
v1.104.4
v1.104.5
v1.105.0-rc.4
v1.105.0-rc.2
v1.105.0-rc.3
v1.105.0-rc.1
v1.105.0-rc.0
v0.0.0000000001-rc.0
v0.0.0000000001-test.0
v0.0.000000001-rc.0
v0.0.0000001-depotdev.01
v0.0.1-actdev.1
v0.0.1-depotdev.01
beta.v0.0.60
v1.104.1
v1.104.1-rc.0
v1.104.1-rc.1
v1.104.1-rc.2
v1.104.2
v1.104.3
v1.104.0
v1.104.0-rc.7
v1.104.0-rc.6
v1.104.0-rc.4
v1.104.0-rc.5
v1.104.0-rc.3
v1.104.0-rc.1
v1.104.0-rc.2
v1.104.0-rc.0
v1.103.0
v1.103.0-rc.10
v1.103.0-rc.11
v1.103.0-rc.9
v1.103.1
v1.103.2
v1.103.3
v1.103.3-rc.0
v1.103.4
v1.103.4-rc.0
v1.103.5
v1.103.5-rc.0
v1.103.0-rc.7
v1.103.0-rc.8
v1.103.0-rc.4
v1.103.0-rc.5
v1.103.0-rc.6
v1.103.0-rc.2
v1.103.0-rc.3
v1.103.0-rc.0
v1.103.0-rc.1
v1.102.0
v1.102.1
v1.102.2
v1.102.3
v1.102.3-rc.0
v1.102.0-rc.3
v1.102.0-rc.4
v1.102.0-rc.2
v1.102.0-rc.1
v1.102.0-rc.0
v1.101.3
v1.101.2
v1.101.1
v1.101.0
v1.101.0-rc.4
v1.101.0-rc.3
v1.101.0-rc.2
v1.101.0-rc.1
v1.101.0-rc.0
v1.100.2
v1.100.2-rc.1
v1.100.2-rc.0
v1.100.1
v1.100.0
v1.100.0-rc.2
v1.100.0-rc.1
v1.100.0-rc.0
v1.99.0
v1.99.0-rc.9
v1.99.0-rc.8
v1.99.0-rc.7
v1.99.0-rc.6
v1.99.0-rc.5
v1.99.0-rc.4
v1.99.0-rc.3
v1.99.0-rc.2
v1.99.0-rc.1
v1.99.0-rc.0
v1.98.0
v1.98.0-rc.4
v1.98.0-rc.3
v1.98.0-rc.2
v1.98.0-rc.1
v1.97.0
v1.97.0-rc.5
v1.97.0-rc.4
v1.97.0-rc.3
v1.97.0-rc.2
v1.97.0-rc.1
v1.97.0-rc.0
v1.96.0
v1.96.0-rc.5
v1.96.0-rc.4
v1.96.0-rc.3
v1.96.0-rc.2
v1.96.0-rc.1
v1.96.0-rc.0
v1.95.1
v1.95.0
v1.95.0-rc.10
v1.95.0-rc.9
v1.95.0-rc.6
v1.95.0-rc.5
v1.95.0-rc.4
v1.95.0-rc.3
v1.95.0-rc.2
v1.95.0-rc.1
v1.95.0-rc.0
v1.94.3
v1.94.2
v1.94.1
v1.94.0
v1.94.0-rc.1
v1.94.0-rc.0
v1.93.2
v1.93.1
v1.93.0
v1.93.0-rc.1
v1.93.0-rc.0
v1.92.0
v1.92.0-rc.1
v1.92.0-rc.0
v1.91.2
v1.91.1
v1.91.0
v1.91.0-rc.3
v1.91.0-rc.2
v1.91.0-rc.1
v0.000000001.0-rc.0
v1.91.0-rc.0
v1.90.1
v1.88.0
v1.87.0
prod-1.86.1
prod-1.86.0
v1.75.0
v1.53.0
v1.45.3
Niko Kovacevic
7b472c887f
Clean up TODOs
|
5 rokov pred | |
|---|---|---|
| .. | ||
| cloud | d29846a73a Convert Allocation.TotalCost to a function and refactor; fix Marshal/UnmarshalJSON and leave TODOs for Window JSON | 5 rokov pred |
| clustercache | 4388d57401 Environment Variable Management API + Thanos Offset | 6 rokov pred |
| clustermanager | 84b537552c Merge pull request #515 from kubecost/bolt/cluster-manager-basic-auth | 6 rokov pred |
| costmodel | af4cfd8d48 Clean up comments | 5 rokov pred |
| env | 5bd84b6c6a Update costmodelenv.go | 5 rokov pred |
| errors | 87687565e9 Pass back warnings from prometheus where appropriate. Move ErrorCollector to prom package, updates to propagate and handle error collection errors appropriately. Add annotations collectors for prometheus metrics. Update all of the kubernetes based metric collectors to use the ClusterCache | 5 rokov pred |
| kubecost | 7b472c887f Clean up TODOs | 5 rokov pred |
| log | 199f4d6fb7 Revert goroutine change | 5 rokov pred |
| prom | 122136fa77 WIP: CostModel.ComputeAllocation: initial compute resources and PVs | 5 rokov pred |
| thanos | 8668373580 Allow passing max resolution | 5 rokov pred |
| util | 5fe71e0182 Resolve merge conflicts | 5 rokov pred |