Resolve merge conflict and merge.

2013-08-22 22:34:06 +05:30
parent e018b2120a e7b8059f17
commit 70cc6eb8f3
65 changed files with 2536 additions and 74 deletions
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -803,3 +803,10 @@ pre {
 #exif_additional_info table tr {
   margin-bottom: 10px;
 }
+
+p.verifier {
+    text-align:center;
+    font-size:50px;
+    none repeat scroll 0% 0% rgb(221, 221, 221);
+    padding: 1em 0px;
+}