diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 03:50:44 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 03:50:44 +0300 |
| commit | 0acee937f55e6d1a198be2549d5cb55a0403dd4d (patch) | |
| tree | 2deaa98bcd99fd2860da758a92816c3bdb838acd /.github | |
| parent | a902138de15067a86a6aeb02fdabd094873da0b2 (diff) | |
| parent | da9a1dcb55548a249ff7a1255f3e518696b81245 (diff) | |
Merge branch 'main' into marchcat/c-merge
# Conflicts:
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c7a758bd0f..ddb0f44150 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -73,7 +73,7 @@ jobs: uses: actions/checkout@v4 with: repository: secondlife/build-variables - ref: viewer + ref: master path: .build-variables - name: Checkout master-message-template |