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

merge changes for storm-1728

parents 47958d19 fc671fa2
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 @ ac87f823
...@@ -589,6 +589,7 @@ Jonathan Yap ...@@ -589,6 +589,7 @@ Jonathan Yap
STORM-1659 STORM-1659
STORM-1674 STORM-1674
STORM-1685 STORM-1685
STORM-1728
Kadah Coba Kadah Coba
STORM-1060 STORM-1060
Jondan Lundquist Jondan Lundquist
......
indra/newview/skins/default/xui/en/panel_region_covenant.xml
+ 2
− 2
View file @ ac87f823
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
mouse_opaque="false" mouse_opaque="false"
name="estate_name_text" name="estate_name_text"
top_delta="0" top_delta="0"
width="150"> width="350">
mainland mainland
</text> </text>
<text <text
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
mouse_opaque="false" mouse_opaque="false"
name="estate_owner_text" name="estate_owner_text"
top_delta="0" top_delta="0"
width="150"> width="350">
(none) (none)
</text> </text>
<text <text
......
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