diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-05-08 10:45:42 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-05-08 10:45:42 +0300 |
| commit | 89b349291c30799c863062e8d8a8b8e6638ceba9 (patch) | |
| tree | 101cde1d13d0df4f6f31ba886d549c3c8752fb49 /indra/newview/skins/default/xui/es/panel_twitter_photo.xml | |
| parent | d2e38538474a175d4532062dc611ef4a70b96aae (diff) | |
MAINT-7626 fix merge conflict2
Diffstat (limited to 'indra/newview/skins/default/xui/es/panel_twitter_photo.xml')
0 files changed, 0 insertions, 0 deletions