Merge branch 'master' into magit-directors-cut

This commit is contained in:
Jonas Bernoulli
2016-11-30 20:07:59 +01:00
5 changed files with 7 additions and 7 deletions

6
.gitmodules vendored
View File

@@ -6,10 +6,10 @@
url = git@github.com:tarsius/auto-compile.git url = git@github.com:tarsius/auto-compile.git
[submodule "borg"] [submodule "borg"]
path = lib/borg path = lib/borg
url = git@gitlab.com:emacscollective/borg.git url = git@github.com:emacscollective/borg.git
[submodule "closql"] [submodule "closql"]
path = lib/closql path = lib/closql
url = git@gitlab.com:emacscollective/closql.git url = git@github.com:emacscollective/closql.git
[submodule "dash"] [submodule "dash"]
path = lib/dash path = lib/dash
url = git@github.com:magnars/dash.el.git url = git@github.com:magnars/dash.el.git
@@ -23,7 +23,7 @@
no-byte-compile = emacsql-pg.el no-byte-compile = emacsql-pg.el
[submodule "epkg"] [submodule "epkg"]
path = lib/epkg path = lib/epkg
url = git@gitlab.com:emacscollective/epkg.git url = git@github.com:emacscollective/epkg.git
[submodule "finalize"] [submodule "finalize"]
path = lib/finalize path = lib/finalize
url = git@github.com:skeeto/elisp-finalize.git url = git@github.com:skeeto/elisp-finalize.git