Commit ff38521c authored by Chris Shantz's avatar Chris Shantz
Browse files

Merge branch '1.0.x' into prod/1.0.x

parents 6c15554e 02456945
<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30"><defs><style>.background{fill:#85bef4;}</style></defs><rect class="background" x="0.5" y="0.5" width="29" height="29"/><path d="M29,1V29H1V1H29m1-1H0V30H30V0Z"/><rect x="11.13" y="22.5" width="13.99" height="3" rx="0.75"/><rect x="11.13" y="16.51" width="13.99" height="3" rx="0.75"/><circle cx="7.13" cy="18.01" r="2.25"/><circle cx="7.13" cy="24" r="2.25"/><path d="M4.05,12.11,5.8,10a5.6,5.6,0,0,0,3.44,1.15c.58,0,.84-.15.84-.42v0c0-.28-.31-.44-1.36-.65C6.52,9.63,4.59,9,4.59,6.93v0C4.59,5,6,3.6,8.75,3.6a6.74,6.74,0,0,1,4.42,1.34L11.58,7.15a5.19,5.19,0,0,0-2.95-1c-.49,0-.71.16-.71.4v0c0,.27.27.44,1.3.63,2.51.46,4.19,1.19,4.19,3.17v0c0,2.05-1.69,3.32-4.33,3.32A7.6,7.6,0,0,1,4.05,12.11Z"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30"><defs><style>.background{fill:#85bef4;}</style></defs><rect class="background" x="0.5" y="0.5" width="29" height="29"/><path d="M29,1V29H1V1H29m1-1H0V30H30V0Z"/><path d="M25.36,16.7l-1.45-.84a8.24,8.24,0,0,0,0-1.72l1.45-.84a1.09,1.09,0,0,0,.51-1.22,11.27,11.27,0,0,0-2.91-5,1.08,1.08,0,0,0-1.31-.17l-1.45.83a8.76,8.76,0,0,0-1.49-.86V5.18a1.09,1.09,0,0,0-.81-1,11.18,11.18,0,0,0-5.8,0,1.09,1.09,0,0,0-.81,1V6.85a8.76,8.76,0,0,0-1.49.86L8.35,6.88A1.08,1.08,0,0,0,7,7.05a11.27,11.27,0,0,0-2.91,5,1.09,1.09,0,0,0,.51,1.22l1.45.84a8.24,8.24,0,0,0,0,1.72l-1.45.84a1.09,1.09,0,0,0-.51,1.22A11.27,11.27,0,0,0,7,23a1.08,1.08,0,0,0,1.31.17l1.45-.83a8.76,8.76,0,0,0,1.49.86v1.67a1.09,1.09,0,0,0,.81,1.05,11.18,11.18,0,0,0,5.8,0,1.09,1.09,0,0,0,.81-1.05V23.15c.08,0,.15-.08.22-.11L17.85,22a6.7,6.7,0,0,1-1.32.4v1.58a8.74,8.74,0,0,1-3.06,0V22.33a7.09,7.09,0,0,1-4-2.35L8,20.8a8.82,8.82,0,0,1-1.53-2.66l1.45-.84a7.47,7.47,0,0,1,0-4.58l-1.5-.86A8.82,8.82,0,0,1,8,9.2l1.53.88a7.47,7.47,0,0,1,3.92-2.24V6.06a8.74,8.74,0,0,1,3.06,0V7.84A7.54,7.54,0,0,1,19.2,9a7.62,7.62,0,0,1,1.28,1.12L22,9.2a8.82,8.82,0,0,1,1.53,2.66L22,12.7a8.73,8.73,0,0,1,.28,1,7.38,7.38,0,0,1-.23,3.62l1.42.82a7.71,7.71,0,0,1-.43,1l1.45,1.45.14.18a11.2,11.2,0,0,0,1.2-2.82A1.09,1.09,0,0,0,25.36,16.7Z"/><path d="M19.68,18.26a5.65,5.65,0,1,0-1.5,1.49l3.58,3.58a.72.72,0,0,0,1,0l.5-.5a.72.72,0,0,0,0-1ZM15,18.61a3.52,3.52,0,1,1,3.52-3.52A3.51,3.51,0,0,1,15,18.61Z"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30"><defs><style>.background{fill:#85bef4;}</style></defs><rect class="background" x="0.5" y="0.5" width="29" height="29"/><path d="M29,1V29H1V1H29m1-1H0V30H30V0Z"/><path d="M23.91,14.14l1.45-.84a1.09,1.09,0,0,0,.51-1.22,11.27,11.27,0,0,0-2.91-5,1.08,1.08,0,0,0-1.31-.17l-1.45.83a8.76,8.76,0,0,0-1.49-.86V5.18a1.09,1.09,0,0,0-.81-1,11.18,11.18,0,0,0-5.8,0,1.09,1.09,0,0,0-.81,1V6.85a8.76,8.76,0,0,0-1.49.86L8.35,6.88A1.08,1.08,0,0,0,7,7.05a11.27,11.27,0,0,0-2.91,5,1.09,1.09,0,0,0,.51,1.22l1.45.84a8.24,8.24,0,0,0,0,1.72l-1.45.84a1.09,1.09,0,0,0-.51,1.22A11.27,11.27,0,0,0,7,23a1.08,1.08,0,0,0,1.31.17l1.45-.83a8.76,8.76,0,0,0,1.49.86v1.67a1.09,1.09,0,0,0,.81,1.05,11.18,11.18,0,0,0,5.8,0,1.09,1.09,0,0,0,.81-1.05V23.15a8.76,8.76,0,0,0,1.49-.86l1.45.83A1.08,1.08,0,0,0,23,23a11.27,11.27,0,0,0,2.91-5,1.09,1.09,0,0,0-.51-1.22l-1.45-.84A8.24,8.24,0,0,0,23.91,14.14ZM21.52,17l2,1.14A8.82,8.82,0,0,1,22,20.8l-2-1.15a7.7,7.7,0,0,1-3.46,2v2.29a8.74,8.74,0,0,1-3.06,0V21.65a7.7,7.7,0,0,1-3.46-2L8,20.8a8.82,8.82,0,0,1-1.53-2.66l2-1.14a7.75,7.75,0,0,1,0-4l-2-1.14A8.82,8.82,0,0,1,8,9.2l2,1.15a7.7,7.7,0,0,1,3.46-2V6.06a8.74,8.74,0,0,1,3.06,0V8.35a7.7,7.7,0,0,1,3.46,2L22,9.2a8.82,8.82,0,0,1,1.53,2.66l-2,1.14a7.75,7.75,0,0,1,0,4ZM15,10.65A4.35,4.35,0,1,0,19.35,15,4.35,4.35,0,0,0,15,10.65Zm0,6.53A2.18,2.18,0,1,1,17.18,15,2.19,2.19,0,0,1,15,17.18Z"/></svg>
Supports Markdown
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