mirror of
https://github.com/kennethreitz-archive/gitx.git
synced 2026-06-05 23:40:18 +00:00
Merge commit 'refs/remotes/andreberg/master' into test_merge
Conflicts: ApplicationController.m GitX.xcodeproj/project.pbxproj PBGitHistoryView.xib PBGitTree.m PBViewController.m
This commit is contained in:
+2
-1
@@ -15,7 +15,8 @@
|
||||
|
||||
.diff .file .diffContent {
|
||||
white-space: pre;
|
||||
font-family: Menlo, Monaco;
|
||||
font-family: Meslo, "Andale Mono", Menlo, Monaco;
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
.diff .file .diffcontent .lineno {
|
||||
|
||||
Reference in New Issue
Block a user