diff options
| author | Kura <kura@kura.io> | 2014-08-02 07:36:32 +0100 |
|---|---|---|
| committer | Kura <kura@kura.io> | 2014-08-02 07:36:32 +0100 |
| commit | cc9f03b91ffc51aef809f049658bb980819f69fd (patch) | |
| tree | 54b1a40a937328d90028663fc0f993614e7bc9cf | |
| parent | a04b89fa62251dfe6935facbf151d95160c21226 (diff) | |
| download | pelican-themes-cc9f03b91ffc51aef809f049658bb980819f69fd.zip pelican-themes-cc9f03b91ffc51aef809f049658bb980819f69fd.tar.gz pelican-themes-cc9f03b91ffc51aef809f049658bb980819f69fd.tar.bz2 | |
Merged in #158 manually due to massive merge conflicts. Closes #158
| -rw-r--r-- | .gitmodules | 2 | ||||
| m--------- | pelicanthemes-generator | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index b5e6f13..0287555 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "pelicanthemes-generator"] path = pelicanthemes-generator - url = https://github.com/badele/pelicanthemes-generator.git + url = https://github.com/badele/pelicanthemes-generator [submodule "Responsive-Pelican"] path = Responsive-Pelican url = git://github.com/ir193/Responsive-Pelican.git diff --git a/pelicanthemes-generator b/pelicanthemes-generator new file mode 160000 +Subproject 916f5a570fcd7c4042917642571f4fda6d42ee3 |