Commit 3bbf9f15 authored by Benjamin Engel's avatar Benjamin Engel
Browse files

Merge branch 'master' into '3-updating-committed-resources'

# Conflicts:
#   subchapters/3-2_committed_resources.adoc
parents 8a71e245 77654390
Pipeline #1140 passed with stage
in 14 seconds