livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-14705: Fix merge conflict

master
Ptolemy 2021-01-25 15:53:43 -08:00
parent ef4c7c1247
commit 760c6a996a
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -1354,6 +1354,7 @@ Sovereign Engineer
SL-11079
OPEN-343
SL-11625
SL-14705
SL-14707
SpacedOut Frye
VWR-34