diff options
author | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-07-29 18:40:19 -0400 |
---|---|---|
committer | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-07-29 18:40:19 -0400 |
commit | 52a355b27541597fc155dab5e4885207b12a0a7b (patch) | |
tree | 7d00edf4d9e39a6b7e4c838ca6f7cb07a4d9a51c /docs/source/index.rst | |
parent | f26c21cd5b7998c903fa67aaf164c07743fee651 (diff) | |
parent | 08cd10d84fd89df3f0cad3835ba8ab8b8000d4b2 (diff) | |
download | mediagoblin-52a355b27541597fc155dab5e4885207b12a0a7b.tar.lz mediagoblin-52a355b27541597fc155dab5e4885207b12a0a7b.tar.xz mediagoblin-52a355b27541597fc155dab5e4885207b12a0a7b.zip |
Merge branch 'ticket-679' into OPW-Moderation-Update
Conflicts:
mediagoblin/auth/tools.py
mediagoblin/auth/views.py
mediagoblin/db/migration_tools.py
mediagoblin/db/migrations.py
mediagoblin/db/models.py
mediagoblin/decorators.py
mediagoblin/user_pages/views.py
Diffstat (limited to 'docs/source/index.rst')
-rw-r--r-- | docs/source/index.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/source/index.rst b/docs/source/index.rst index d71f39f8..de6c9c0d 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -74,6 +74,7 @@ This guide covers writing new GNU MediaGoblin plugins. pluginwriter/database pluginwriter/api pluginwriter/tests + pluginwriter/media_type_hooks Part 4: Developer's Zone @@ -87,6 +88,7 @@ This chapter contains various information for developers. devel/codebase devel/storage devel/originaldesigndecisions + devel/migrations Indices and tables |