aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Spaeth <Sebastian@SSpaeth.de>2013-12-12 16:38:35 +0100
committerSebastian Spaeth <Sebastian@SSpaeth.de>2013-12-12 16:38:35 +0100
commit7b2f3d2a9e353d297b7d88a78d3b13ddf13efff2 (patch)
tree4bb6658f5f4cf18c84dd0590d1b7191431e819ff
parenta42dda21f96f5124d97011c318f068b92a4222b0 (diff)
downloadmediagoblin-7b2f3d2a9e353d297b7d88a78d3b13ddf13efff2.tar.lz
mediagoblin-7b2f3d2a9e353d297b7d88a78d3b13ddf13efff2.tar.xz
mediagoblin-7b2f3d2a9e353d297b7d88a78d3b13ddf13efff2.zip
Finalize merging of the blog branch by Aditi (Gsoc 2013)
Comment out the blog plugin by default. Remove the blog README.md in the root directory.
-rw-r--r--README.md2
-rw-r--r--mediagoblin.ini3
2 files changed, 2 insertions, 3 deletions
diff --git a/README.md b/README.md
deleted file mode 100644
index d6b023a9..00000000
--- a/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-mediagoblin_blog
-================
diff --git a/mediagoblin.ini b/mediagoblin.ini
index dc88cafa..934858a2 100644
--- a/mediagoblin.ini
+++ b/mediagoblin.ini
@@ -51,4 +51,5 @@ base_url = /mgoblin_media/
[[mediagoblin.plugins.geolocation]]
[[mediagoblin.plugins.basic_auth]]
[[mediagoblin.media_types.image]]
-[[mediagoblin.media_types.blog]]
+#-> uncomment below to enable blog and run ./bin/gmg dbudate
+#[[mediagoblin.media_types.blog]]