Commit aa49daf
committed
Merge branch 'PMM-15360-om-switch-flag' into PMM-15360-om-nav-gate
# Conflicts:
# api/server/v1/json/client/server_service/change_settings_responses.go
# api/server/v1/json/client/server_service/get_read_only_settings_responses.go
# api/server/v1/json/client/server_service/get_settings_responses.go3 files changed
Lines changed: 4 additions & 4 deletions
File tree
- api/server/v1/json/client/server_service
Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments