diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-03-22 11:06:52 +0100 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-03-22 11:06:52 +0100 |
| commit | cd47fa8e718f6ede07aead032d524022bd68b608 (patch) | |
| tree | 5c451ce83cff35c8962f2a06da5f950eb91ce1dc /.gitmodules | |
| parent | 6225d21fa6fd87edf10731df87cd3a7099049358 (diff) | |
| parent | 49f9e5cc6bf933705500ad96d674df6a9df7f713 (diff) | |
Merge master and resolve conflicts
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 6e8b3ab1..f70c570d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "ext/hera"] path = ext/hera - url = https://bitbucket.org/grey_narn/hera.git + url = https://github.com/grey-narn/hera.git |