Pull changes and resolve merge conflict.
[mediagoblin.git] / mediagoblin / media_types / blog / templates /
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-10 AditiChange button names to Save and Blog.
2013-08-09 AditiMerge branch 'master' of git://gitorious.org/mediagobli...
2013-08-07 AditiMove templates to blog plugin from all mediagoblin...