diff options
| author | Ishan Khanna <ishan1604@gmail.com> | 2015-03-04 02:31:39 +0530 |
|---|---|---|
| committer | Ishan Khanna <ishan1604@gmail.com> | 2015-03-04 02:31:39 +0530 |
| commit | 3dda761791907befe1b3676ce804cf7a67596bda (patch) | |
| tree | 47a25bb75075900a6257e080b71c60bdf03e34af | |
| parent | f3fd3c464c927ce099ede3bcc4dea16c68fc34fa (diff) | |
| parent | 568854f6dd0c25a0da30b1786161803ced1ec694 (diff) | |
| download | open-keychain-3dda761791907befe1b3676ce804cf7a67596bda.tar.gz open-keychain-3dda761791907befe1b3676ce804cf7a67596bda.tar.bz2 open-keychain-3dda761791907befe1b3676ce804cf7a67596bda.zip | |
Merge remote-tracking branch 'upstream/development' into development
Conflicts:
.gitmodules
| -rw-r--r-- | .gitmodules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 249b72479..1577e4f83 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 |