Merge remote-tracking branch 'upstream/master'

Keep the latex and tag-specific feeds in bootstrap3

Conflicts:
	pelican-bootstrap3/templates/base.html

1 files changed, 55 insertions, 3 deletions

diff --git a/.gitmodules b/.gitmodules
index 5045352..0287555 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,15 @@
+[submodule "pelicanthemes-generator"]
+	path = pelicanthemes-generator
+	url = https://github.com/badele/pelicanthemes-generator
+[submodule "Responsive-Pelican"]
+	path = Responsive-Pelican
+	url = git://github.com/ir193/Responsive-Pelican.git
+[submodule "hauntr"]
+        path = hauntr
+        url = https://github.com/kura/hauntr.git
+[submodule "ghastly"]
+	path = ghastly
+	url = https://github.com/kura/ghastly.git
 [submodule "svbtle"]
 	path = svbtle
 	url = https://github.com/wting/pelican-svbtle.git
@@ -51,7 +63,7 @@
 	url = https://github.com/PierrePaul/html5-dopetrope.git
 [submodule "plumage"]
 	path = plumage
-	url = git@github.com:kdeldycke/plumage.git
+	url = https://github.com/kdeldycke/plumage.git
 [submodule "sundown"]
 	path = sundown
 	url = https://github.com/keningle/pelican-sundown.git
@@ -60,16 +72,56 @@
 	url = https://github.com/porterjamesj/crowsfoot.git
 [submodule "elegant"]
 	path = elegant
-	url = git@github.com:talha131/pelican-elegant.git
+	url = https://github.com/talha131/pelican-elegant.git
 [submodule "niu-x2"]
 	path = niu-x2
 	url = http://github.com/wilbur-ma/niu-x2
 [submodule "storm"]
 	path = storm
-	url = git@github.com:redVi/storm.git
+	url = https://github.com/redVi/storm.git
 [submodule "pure"]
 	path = pure
 	url = https://github.com/danclaudiupop/pure.git
 [submodule "jesuislibre"]
 	path = jesuislibre
 	url = https://github.com/badele/pelican-theme-jesuislibre.git
+[submodule "pelipress"]
+	path = pelipress
+	url = https://github.com/jjimenezlopez/pelipress.git
+[submodule "blueidea"]
+	path = blueidea
+	url = https://github.com/blueicefield/pelican-blueidea.git
+[submodule "sora"]
+	path = sora
+	url = https://github.com/if1live/pelican-sora.git
+[submodule "pelican-simplegrey"]
+	path = pelican-simplegrey
+	url = https://github.com/fle/pelican-simplegrey
+[submodule "pujangga"]
+	path = pujangga
+	url = https://github.com/habibillah/pujangga.git
+[submodule "lovers"]
+	path = lovers
+	url = https://github.com/chdoig/pelican-bootstrap3-lovers.git
+[submodule "BT3-Flat"]
+	path = BT3-Flat
+	url = https://github.com/KenMercusLai/BT3-Flat.git
+[submodule "voidy-bootstrap"]
+	path = voidy-bootstrap
+	url = https://github.com/robulouski/voidy-bootstrap.git
+[submodule "pelican-iliork"]
+	path = pelican-iliork
+	url = https://github.com/yuex/pelican-iliork.git
+[submodule "burrito"]
+	path = burrito
+	url = https://github.com/fly/burrito.git
+[submodule "maggner-pelican"]
+	path = maggner-pelican
+	url = https://github.com/kplaube/maggner-pelican.git
+[submodule "pelican-sober"]
+	path = pelican-sober
+	url = https://github.com/fle/pelican-sober.git
+[submodule "twenty-html5up"]
+	path = twenty-html5up
+	url = git://github.com/frankV/twenty-pelican-html5up.git
+