提交 8486f220 编写于 作者: J Justin Spahr-Summers

Merge remote-tracking branch 'OliverLetterer/patch-1'

Conflicts:
	Objective-C.gitignore
# Xcode # Xcode
.DS_Store .DS_Store
build/* build/
*.pbxuser *.pbxuser
!default.pbxuser !default.pbxuser
*.mode1v3 *.mode1v3
...@@ -14,4 +14,4 @@ build/* ...@@ -14,4 +14,4 @@ build/*
xcuserdata xcuserdata
profile profile
*.moved-aside *.moved-aside
DerivedData DerivedData
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册