cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/development' into development

Browse Source 
Conflicts:
	.gitmodules
This commit is contained in:
Ishan Khanna
2015-03-04 02:31:39 +05:30
parent f3fd3c464c 568854f6dd
commit 3dda761791
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@@ -19,11 +19,11 @@
[submodule "extern/minidns"]
path = extern/minidns
url = https://github.com/open-keychain/minidns.git
ignore = dirty
ignore = dirty
[submodule "extern/TokenAutoComplete"]
path = extern/TokenAutoComplete
url = https://github.com/open-keychain/TokenAutoComplete
[submodule "extern/safeslinger-exchange"]
path = extern/safeslinger-exchange
url = https://github.com/open-keychain/exchange-android
url = https://github.com/open-keychain/exchange-android
ignore = dirty