Merge branch 'master' of github.com:gogits/gogs

Conflicts:
	public/js/app.js

diff --cc public/css/gogs.css
index 83d1b96fe237180a3c08aa5a86eef6db27f4e7c1,d2ba5b9a430f490016a18991bf3075b1ff577eea..eb5f7ad2a5d715798da5c69a5bcbec5889342845
--- 1/public/css/gogs.css
--- 2/public/css/gogs.css
+++ b/public/css/gogs.css
@@@ -644,17 -644,21 +644,29 @@@ html, body 
  }
  
  .file-content .file-body {
-     padding: 30px 30px 50px;
+     padding: 0;
+     border: none;
+     background-color: #FFF;
+ }
+ 
+ .file-content .file-body pre {
+     background-color: #FFF;
+     border: none;
+ }
+ 
+ .file-content .markdown > pre > ol.linenums > li:first-child {
+     padding-top: 0;
+     margin-top: 0;
  }
  
 +.file-content .file-body.file-code {
 +    padding: 0;
 +}
 +
 +.file-content .file-body.file-code > pre {
 +    border: none;
 +}
 +
  .branch-list th, .commit-list th {
      background-color: #FFF;
      line-height: 28px !important;

diff --cc public/js/app.js
Simple merge

diff --cc routers/repo/single.go
Simple merge