diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-10-25 21:31:05 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-10-25 21:31:05 +0300 |
commit | 98a431bd16e0e06f8f83b93fd232363403c6463b (patch) | |
tree | 0e0bc8bc1c5ab18fda8ff5ba948c13b530c8a6cf /.gitignore | |
parent | 69aa02d2e1873970302942487b96d3a6aca119e5 (diff) | |
parent | 2e8e96cfbcb383a667d1b938f364f0bbafcad5b4 (diff) |
Merge branch 'main' into DRTVWR-591-maint-X
# Conflicts:
# indra/newview/llinventorygallery.cpp
Diffstat (limited to '.gitignore')
-rwxr-xr-x | .gitignore | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 80eca667df..f0b5f86211 100755 --- a/.gitignore +++ b/.gitignore @@ -73,4 +73,6 @@ tarfile_tmp trivial_change_force_build web/config.* web/locale.* -web/secondlife.com.*
\ No newline at end of file +web/secondlife.com.* + +.env |