Joelles commit message
endlich
Merge branch 'develop' of github.com:Git-Schulung-SUB/zentralesrepo into develop

Konflikt gelöst?
Conflicts:
	README.md
Konflikt endlich lösen
Merge branch 'develop' of github.com:Git-Schulung-SUB/zentralesrepo into develop

Conflicts:
	README.md
Merge branch 'develop' of github.com:Git-Schulung-SUB/zentralesrepo into develop

Conflicts:
	README.md