Merge branch '2015.8' into '2016.3'

Browse source

Conflicts:
  - doc/conf.py

...

This commit is contained in:

rallytime 2016-08-25 10:08:52 -06:00

parent b3f6367621 2a12795bac

commit 8ad6a12c80

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