Merge branch 'master' of github.com:Lyndir/MasterPassword
Conflicts: .gitmodules
This commit is contained in:
6
.gitmodules
vendored
6
.gitmodules
vendored
@@ -13,9 +13,9 @@
|
||||
[submodule "External/RHStatusItemView"]
|
||||
path = External/RHStatusItemView
|
||||
url = git://github.com/lhunath/RHStatusItemView.git
|
||||
[submodule "External/DCIntrospect"]
|
||||
path = External/DCIntrospect
|
||||
url = https://github.com/lhunath/DCIntrospect.git
|
||||
[submodule "External/LoveLyndir"]
|
||||
path = External/LoveLyndir
|
||||
url = git://github.com/Lyndir/love-lyndir.client.git
|
||||
[submodule "External/DCIntrospect"]
|
||||
path = External/DCIntrospect
|
||||
url = https://github.com/lhunath/DCIntrospect.git
|
||||
|
Reference in New Issue
Block a user