Skip to content

G
galaxy-iOS
Commit 5af4853a authored by David黄金龙's avatar David黄金龙
Browse files
Options

Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

parents a8017e1a fb5931b9
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
galaxy/.gitignore
View file @ 5af4853a
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
*.xcodeproj/project.xcworkspace/xcuserdata/*.xcuserdatad/UserInterfaceState.xcuserstate #*.xcodeproj/project.xcworkspace/xcuserdata/*.xcuserdatad/UserInterfaceState.xcuserstate
*.xcodeproj/xcuserdata/*.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist #*.xcodeproj/xcuserdata/*.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
*.xcodeproj/xcuserdata/*.xcuserdatad/xcschemes/xcschememanagement.plist #*.xcodeproj/xcuserdata/*.xcuserdatad/xcschemes/xcschememanagement.plist
*.xcodeproj/project.xcworkspace/xcuserdata/*.xcuserdatad/UserInterfaceState.xcuserstate #*.xcodeproj/project.xcworkspace/xcuserdata/*.xcuserdatad/UserInterfaceState.xcuserstate
## Build generated ## Build generated
build/ build/
...@@ -75,4 +75,4 @@ Carthage/Build ...@@ -75,4 +75,4 @@ Carthage/Build
fastlane/report.xml fastlane/report.xml
fastlane/Preview.html fastlane/Preview.html
fastlane/screenshots fastlane/screenshots
fastlane/test_output fastlane/test_output
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment