# Conflicts: # indra/newview/llappviewer.cpp # indra/newview/llviewerobjectlist.cpp # indra/newview/skins/default/xui/en/panel_preferences_setup.xml # indra/newview/skins/default/xui/ja/panel_preferences_setup.xml |
||
|---|---|---|
| .. | ||
| workflows | ||
| dependabot.yml | ||
| labeler.yaml | ||
| pull_request_template.md | ||