Merge remote-tracking branch 'upstream/master' into basic_auth
authorRodney Ewing <ewing.rj@gmail.com>
Thu, 30 May 2013 23:31:15 +0000 (16:31 -0700)
committerRodney Ewing <ewing.rj@gmail.com>
Thu, 30 May 2013 23:31:15 +0000 (16:31 -0700)
commit9a899af02b6dbd2792482f39405d22e0361c8bf6
tree6168a5e82e48367b873820add9116af76249d6cf
parentd1c9ef47c43d33f265d93ef2ded23fcbb9213999
parent0e4d6221fae26709d7ad32f40318df874b570bf8
Merge remote-tracking branch 'upstream/master' into basic_auth
mediagoblin/templates/mediagoblin/user_pages/media.html