Merge branch 'master' into dev

This commit is contained in:
Joshua Davidson 2018-10-19 19:01:04 -04:00
commit 82b7e484f3
2 changed files with 2 additions and 2 deletions

View file

@ -203,7 +203,7 @@
</condition>
<value>15</value>
</max-rate-of-change>
<max-rate-of-change>8</max-rate-of-change>
<max-rate-of-change>6</max-rate-of-change>
</filter>
<filter>

View file

@ -1 +1 @@
4679
4680