Commit 4bbc91f2 authored by Iztok Juvancic's avatar Iztok Juvancic
Browse files

Merge branch 'develop' of https://forge.etsi.org/gitlab/DIAMETER/DiameterShDh into develop

parents f715720a 769ae169

.gitignore

+1 −0
Original line number Original line Diff line number Diff line
@@ -3,3 +3,4 @@ 
.project

.project

/.settings/

/.settings/

/.gitignore.my

/.gitignore.my

.DEPENDENCIES

.gitmodules

+8 −0
Original line number Original line Diff line number Diff line
@@ -6,3 +6,11 @@ 
	path = LibDiameter

	path = LibDiameter

	url = https://forge.etsi.org/gitlab/LIBS/LibDiameter.git

	url = https://forge.etsi.org/gitlab/LIBS/LibDiameter.git

	branch = develop

	branch = develop

[submodule "LibSip"]

	path = LibSip

	url = https://forge.etsi.org/gitlab/LIBS/LibSip.git

	branch = develop

[submodule "LibIms"]

	path = LibIms

	url = https://forge.etsi.org/gitlab/LIBS/LibIms.git

	branch = develop

LibIms @ 2b7adb79

Original line number Original line Diff line number Diff line 
Subproject commit 2b7adb7968bec5d23f764c7b6866fadba07406f0

LibSip @ 67559f9d

Original line number Original line Diff line number Diff line 
Subproject commit 67559f9dc48f597b8b931e4242d8ae4d54bddf7c