Merge branch 'develop' of github.com:ennorehling/eressea into develop

2019-08-13 17:43:03 +02:00 · 2019-08-13 17:43:03 +02:00 · b109e21d33
parent c8c2a6fe58 206a3007a7
commit b109e21d33
2 changed files with 1 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -17,7 +17,6 @@ addons:
      - valgrind
      - cppcheck
      - shellcheck
-      - iwyu
 os:
  - linux
 notifications:
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 1854780fe3073e491775836c22f709668b1fff62
+Subproject commit 6965050165efdae89305a13bff06283229f143f4