Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ulf Gebhardt 2016-05-17 12:46:50 +02:00
commit b8b84c63b9

2
.gitmodules vendored
View File

@ -1,6 +1,6 @@
[submodule "lib/system"]
path = lib/system
url = git@mojotrollz.eu:system.git
url = git@mojotrollz.eu:webcraft/system.git
[submodule "rhein/sai/saimod_webcraft_billing_satelite"]
path = rhein/sai/saimod_webcraft_billing_satelite
url = git@mojotrollz.eu:webcraft/saimod_webcraft_billing_satelite.git