diff options
author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-06-20 16:02:10 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-20 16:02:10 -0700 |
commit | 68963019cd62fedf94ade25c83f22804ec237818 (patch) | |
tree | 958d58f7e236ec6d1f5773ef30300a5e3314e832 /.git-blame-ignore-revs | |
parent | 2515f422cfea1d2ad6947022636c1e3a70f4b282 (diff) | |
parent | a52391d582ec7299273d3ff38efdb2455da7700e (diff) |
Merge pull request #1791 from secondlife/brad/webrtc-voice-develop
webrtc-voice merge to develop
Diffstat (limited to '.git-blame-ignore-revs')
-rw-r--r-- | .git-blame-ignore-revs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index cb7f6988d5..cb070b0881 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -3,6 +3,7 @@ # Trim trailing whitespace a0b3021bdcf76859054fda8e30abb3ed47749e83 8444cd9562a6a7b755fcb075864e205122354192 +863c541ce0b2e3e1e566cc88423d3e87aaedb6ca # Wrong line endings 1b67dd855c41f5a0cda7ec2a68d98071986ca703 6cc7dd09d5e69cf57e6de7fb568a0ad2693f9c9a |