aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Tallon <jessica@megworld.co.uk>2014-07-20 09:28:30 +0100
committerJessica Tallon <jessica@megworld.co.uk>2014-07-20 09:28:30 +0100
commit043b108f544e444f80d08ab4cccee395a4af49de (patch)
tree128b92334716663eb229f6f680f2a08326dd1648
parent58432bcb8cf1795b90bc08b1a9615c64d77e1e3a (diff)
downloadmediagoblin-043b108f544e444f80d08ab4cccee395a4af49de.tar.lz
mediagoblin-043b108f544e444f80d08ab4cccee395a4af49de.tar.xz
mediagoblin-043b108f544e444f80d08ab4cccee395a4af49de.zip
Revert "Add JPope's sandy 70s speedboat theme"
The theme is in the wrong place. Elrond suggested in IRC that actually it should go in mediagoblin/themes. This reverts commit 58432bcb8cf1795b90bc08b1a9615c64d77e1e3a.
-rw-r--r--.gitignore5
-rw-r--r--.gitmodules3
m---------user_dev/themes/sandyseventiesspeedboat0
3 files changed, 1 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index 53c91384..2524739f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,7 @@
/docs/build
/api-docs/build
/api-docs/source/mediagoblin*
-/user_dev/*
+/user_dev/
/paste_local.ini
/mediagoblin_local.ini
/mediagoblin.db
@@ -25,9 +25,6 @@
/kombu.db
/server-log.txt
-# Unignore theme directory
-!/user_dev/themes/
-
# pyconfigure/automake generated files
/Makefile
/autom4te.cache/
diff --git a/.gitmodules b/.gitmodules
index a71a2ccd..20fa20e2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,3 @@
[submodule "extlib/skeleton"]
path = extlib/skeleton
url = git://github.com/dhg/Skeleton.git
-[submodule "user_dev/themes/sandyseventiesspeedboat"]
- path = user_dev/themes/sandyseventiesspeedboat
- url = https://github.com/jpope777/sandyseventiesspeedboat-mg.git
diff --git a/user_dev/themes/sandyseventiesspeedboat b/user_dev/themes/sandyseventiesspeedboat
deleted file mode 160000
-Subproject 994294e59a5248e29af4418903ce4fb40bd67be