Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
authorjpope <jpope@jpope.org>
Mon, 6 Jan 2014 02:56:28 +0000 (20:56 -0600)
committerjpope <jpope@jpope.org>
Mon, 6 Jan 2014 02:56:28 +0000 (20:56 -0600)
commit2fb6f1d03a121dfde47ab64d5118769106ebe6a5
tree22daeff685d468d95bec63372565927265a548af
parentda77b8e91352d4da280b23ae3c19b9857f140f94
parent8b8698eff5bda8afa94a5e597756125bb11cf150
Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton

Conflicts:
.gitmodules
mediagoblin/static/css/base.css