Merge remote-tracking branch 'brentsimmons/master'

This commit is contained in:
Olof Hellman 2018-04-25 21:41:22 -07:00
commit 2d742b922e
1 changed files with 2 additions and 0 deletions

2
.gitignore vendored
View File

@ -20,6 +20,8 @@ DerivedData/
!default.perspectivev3 !default.perspectivev3
xcuserdata/ xcuserdata/
IDEWorkspaceChecks.plist
## Other ## Other
*.moved-aside *.moved-aside
*.xccheckout *.xccheckout