Merge branch 'master' into 'NickFreeman-master-patch-38064'

# Conflicts:
#   pages/kontakt.html
2 jobs for NickFreeman-master-patch-38064 in 4 minutes and 7 seconds (queued for 3 seconds)
Status Name Job ID Coverage
  Build
passed build #11827
docker

00:01:51

 
  Test
failed test #11828
docker allowed to fail

00:02:16

 
Name Stage Failure
failed
test Test
/builds/NickFreeman/karlsruhe.freifunk.net/Rakefile:36:in `block in <top (required)>'
/builds/NickFreeman/karlsruhe.freifunk.net/vendor/bundle/ruby/2.4.0/gems/rake-12.3.0/exe/rake:27:in `<top (required)>'
/usr/local/bin/bundle:23:in `load'
/usr/local/bin/bundle:23:in `<main>'
Tasks: TOP => htmlproofer
(See full trace by running task with --trace)
Running after_script
Uploading artifacts for failed job
ERROR: Job failed: exit code 1