diff options
author | Erik Kundiman <erik@megapahit.org> | 2024-08-23 10:16:42 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2024-08-23 10:16:42 +0800 |
commit | a9113d199645fcd3db46e120c0d9e86fb3f1ce93 (patch) | |
tree | 1a8b156d7e8f4830804b9600e5ab3e731b1ab872 /indra/newview/skins/default/xui/en/floater_emoji_picker.xml | |
parent | 60f0e2894f311d310273aef6dc9743bec2fb7308 (diff) | |
parent | 25c4ba3a76c3dd81bb9554abf27ab3cbe5dcd95d (diff) |
Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into 2024.06-atlasaurus
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_emoji_picker.xml')
0 files changed, 0 insertions, 0 deletions