diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2015-11-09 02:34:25 +0100 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2015-11-09 02:34:25 +0100 |
| commit | a5a724b144c389188e3e52ce39f3be53d7d8f120 (patch) | |
| tree | 4f96aef838ec8ef0efe1a34317b05f251557cd0a | |
| parent | f65117beebab60bd62b8657b04f1dc95b427e666 (diff) | |
| parent | 21356195bc215ed0642bce05cb4d03faca2bea69 (diff) | |
| download | nixos-a5a724b144c389188e3e52ce39f3be53d7d8f120.tar nixos-a5a724b144c389188e3e52ce39f3be53d7d8f120.tar.gz nixos-a5a724b144c389188e3e52ce39f3be53d7d8f120.tar.bz2 nixos-a5a724b144c389188e3e52ce39f3be53d7d8f120.tar.xz nixos-a5a724b144c389188e3e52ce39f3be53d7d8f120.zip | |
Merge branch 'master' into ymir-git-perms
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 893c312d..a5cf9a30 100644 --- a/.gitmodules +++ b/.gitmodules | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | url = git://git.yggdrasil.li/laeradhr | 6 | url = git://git.yggdrasil.li/laeradhr |
| 7 | [submodule "yggdrasil"] | 7 | [submodule "yggdrasil"] |
| 8 | path = yggdrasil | 8 | path = yggdrasil |
| 9 | url = ssh://git@git.yggdrasil.li/yggdrasil | 9 | url = ssh://gitolite@git.yggdrasil.li/yggdrasil |
| 10 | [submodule "dotfiles"] | 10 | [submodule "dotfiles"] |
| 11 | path = dotfiles | 11 | path = dotfiles |
| 12 | url = git://git.yggdrasil.li/dotfiles | 12 | url = git://git.yggdrasil.li/dotfiles |