Merge branch 'master' into 'MoveLinks'
authorKatrin Fischer <katrin.fischer.83@web.de>
Sun, 6 May 2018 16:27:35 +0000 (16:27 +0000)
committerKatrin Fischer <katrin.fischer.83@web.de>
Sun, 6 May 2018 16:27:35 +0000 (16:27 +0000)
commitcb41fc243c7d602ac63a493a29230ebe4b918978
tree1f7b438654530984e54ae51ba6ec625d4d5921a0
parent07c6fb9708df7ed7f3a2452c1fb8df8049a81610
parent217f455ac8ef7f2f9b706bcca0b6af400b4eb18c
Merge branch 'master' into 'MoveLinks'

# Conflicts:
#   source/index.rst
source/index.rst
source/miscellaneous.rst