Merge branch 'master' into feature/goimports

This commit is contained in:
Sandro Santilli authored and GitHub committed 2016-11-05 22:54:20 +01:00
commit f36544f98d
5 files changed
+8 -27

No files matched your search

-5
View File
@@ -177,11 +177,6 @@ func Diff(ctx *context.Context) {
}
}
setEditorconfigIfExists(ctx)
if ctx.Written() {
return
}
ctx.Data["CommitID"] = commitID
ctx.Data["IsSplitStyle"] = ctx.Query("style") == "split"
ctx.Data["Username"] = userName