Merge remote-tracking branch 'upstream/master' · YUCoderSW/Coding-iOS@625ffd0 · GitHub
Skip to content

Commit 625ffd0

Browse files
sumengsumeng
authored andcommitted
Merge remote-tracking branch 'upstream/master'
2 parents 018998e + b14cdf8 commit 625ffd0

15 files changed

Lines changed: 302 additions & 29 deletions

Coding_iOS.xcodeproj/project.pbxproj

Lines changed: 10 additions & 6 deletions

Coding_iOS/Controllers/FileInfoViewController.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// FileInfoViewController.h
33
// Coding_iOS
44
//
5-
// Created by Ease on 15/8/12.
5+
// Created by Ease on 15/8/20.
66
// Copyright (c) 2015年 Coding. All rights reserved.
77
//
88

Coding_iOS/Controllers/FileInfoViewController.m

Lines changed: 27 additions & 1 deletion

0 commit comments

Comments
 (0)