Merge branch '2016.3' into '2016.11'

Browse source

Conflicts:
  - doc/conf.py

...

This commit is contained in:

rallytime 2017-07-18 13:45:29 -06:00

parent f06a6f1796 e9b0f20f8a

commit 0aa5dde1de

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available