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

merge changes for storm-1862

parents c97ddff3 6416ba76
No related branches found
No related tags found
No related merge requests found
......@@ -471,6 +471,7 @@ Hiro Sommambulist
VWR-143
Hitomi Tiponi
STORM-1741
STORM-1862
Holger Gilruth
Horatio Freund
Hoze Menges
......@@ -633,6 +634,7 @@ Jonathan Yap
STORM-1793
STORM-1810
STORM-1860
STORM-1862
Kadah Coba
STORM-1060
Jondan Lundquist
......
......@@ -46,7 +46,7 @@
tab_group="2"
top="0"
height="200"
width="254"
width="244"
user_resize="true">
<button
height="20"
......@@ -73,10 +73,11 @@
parse_highlights="true"
parse_urls="true"
left="1"
width="249">
width="238">
</chat_history>
<line_editor
bottom="0"
left="3"
follows="left|right|bottom"
font="SansSerifSmall"
height="20"
......@@ -84,7 +85,7 @@
layout="bottomleft"
name="chat_editor"
tab_group="3"
width="249">
width="236">
</line_editor>
</layout_panel>
</layout_stack>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment