Skip to content
Snippets Groups Projects
Commit f1acdc56 authored by Oz Linden's avatar Oz Linden
Browse files

merge changes for storm-1992

parents 8df635f8 e390255d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
doc/contributions.txt
+ 1
− 0
View file @ f1acdc56
...@@ -675,6 +675,7 @@ Jonathan Yap ...@@ -675,6 +675,7 @@ Jonathan Yap
STORM-1953 STORM-1953
STORM-1957 STORM-1957
OPEN-113 OPEN-113
STORM-1992
STORM-1989 STORM-1989
STORM-1987 STORM-1987
STORM-1986 STORM-1986
......
indra/newview/skins/default/xui/en/floater_im_session.xml
+ 1
− 1
View file @ f1acdc56
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
default_tab_group="3" default_tab_group="3"
tab_group="2" tab_group="2"
name="right_part_holder" name="right_part_holder"
min_width="172"> min_width="230">
<layout_stack <layout_stack
animate="true" animate="true"
default_tab_group="2" default_tab_group="2"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment