aboutsummaryrefslogtreecommitdiffstats
path: root/docs/source/mgext/__init__.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2012-02-18 10:01:47 -0600
committerChristopher Allan Webber <cwebber@dustycloud.org>2012-02-18 10:01:47 -0600
commit63352aaf70d97a37b6277fab0f9b957d34dcb9df (patch)
treeacdedffc204d89f1f71f09696270e5719f5e3123 /docs/source/mgext/__init__.py
parent7f3ec607a34e727324397c2bf240f771b12a0455 (diff)
parentfeba5c5287a7cb4c0ed8f5124ad60a8a291770ad (diff)
downloadmediagoblin-63352aaf70d97a37b6277fab0f9b957d34dcb9df.tar.lz
mediagoblin-63352aaf70d97a37b6277fab0f9b957d34dcb9df.tar.xz
mediagoblin-63352aaf70d97a37b6277fab0f9b957d34dcb9df.zip
Merge branch 'master' into sqlmigrate
Conflicts: mediagoblin/db/sql/models.py
Diffstat (limited to 'docs/source/mgext/__init__.py')
-rw-r--r--docs/source/mgext/__init__.py0
1 files changed, 0 insertions, 0 deletions
diff --git a/docs/source/mgext/__init__.py b/docs/source/mgext/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/docs/source/mgext/__init__.py
+++ /dev/null