diff options
author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-03-22 10:25:27 +0100 |
---|---|---|
committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-03-22 10:25:27 +0100 |
commit | bb6f10aff11e05baec2d2d10c544a2ea1c302bc6 (patch) | |
tree | 665b6fcbdf6c951d31206852a2d356ef103ada18 /.gitmodules | |
parent | f78d65f0bd6aaf5f92639e2b809e1711acf929f7 (diff) | |
parent | 2ec0ac1f006577d520accbe605a61fc10ede3352 (diff) |
Merge master and fix 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 |