Merge remote-tracking branch 'origin/master'

# Conflicts:
#	docs/source/openmw-mods/index.rst
This commit is contained in:
Ryan Tucker 2016-12-19 21:09:34 -08:00
commit 0c71fde523

View file

@ -15,4 +15,4 @@ The following document is the complete reference guide to modifying, or modding,
differences
mod-install
settings/index
convert_bump_mapped_mods
convert_bump_mapped_mods