Merge branch '2016.11' into '2017.7'

Browse source

Conflicts:
  - doc/conf.py

...

This commit is contained in:

rallytime 2018-04-03 10:51:59 -04:00

parent 307e7f35f9 3e844ed1df

commit 8522c1d634

No known key found for this signature in database

GPG key ID: E8F1A4B90D0DEA19

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