Pull changes and resolve merge conflict.
[mediagoblin.git] / mediagoblin / media_types / blog / config_spec.ini
2013-08-28 AditiPull changes and resolve merge conflict.
2013-08-25 AditiMerge branch 'master' of git://gitorious.org/mediagobli...
2013-08-22 AditiResolve merge conflict and merge.
2013-08-09 AditiMerge branch 'master' of git://gitorious.org/mediagobli...
2013-08-04 AditiMerge branch 'master' of git://gitorious.org/mediagobli...
2013-07-31 AditiMerge branch 'master' of git://gitorious.org/mediagobli...
2013-07-29 AditiMerge branch 'master' of git://gitorious.org/mediagobli...
2013-07-24 AditiMerge branch 'master' of git://gitorious.org/mediagobli...
2013-07-16 AditiAdd config_spec for blog plugin specification.