diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 06:57:52 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 07:08:25 +0300 |
| commit | 84dfe55810815e8c274044cea5c81aaed89a787f (patch) | |
| tree | 4e499acfe5617682c5eca52998b5c10cdac8609a /doc/contributions.txt | |
| parent | 16e638db975278f6018fe1e21ba1954b7f159149 (diff) | |
| parent | da9a1dcb55548a249ff7a1255f3e518696b81245 (diff) | |
Merge branch 'main' into marchcat/y-merge
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
Diffstat (limited to 'doc/contributions.txt')
| -rwxr-xr-x | doc/contributions.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index d0c7fc9733..a14ffa24fd 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -296,6 +296,7 @@ Beq Janus SL-18637 SL-19317 SL-19660 + SL-20610 Beth Walcher Bezilon Kasei Biancaluce Robbiani |