Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/XITRIX/iTorrent
Browse files Browse the repository at this point in the history
  • Loading branch information
XITRIX committed Jun 19, 2018
2 parents f361bb1 + 99e363f commit a382da2
Show file tree
Hide file tree
Showing 33 changed files with 44 additions and 5,948 deletions.
Binary file modified .DS_Store
Binary file not shown.
15 changes: 9 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
Podfile.lock
Pods
iTorrent.xcworkspace
iTorrent.xcworkspace/xcuserdata/xitrix.xcuserdatad/UserInterfaceState.xcuserstate
include/libtorrent/.DS_Store
*.lock
**/*.lock
Pods/
iTorrent.xcworkspace/xcuserdata
iTorrent.xcodeproj/xcuserdata
iTorrent.xcodeproj/project.xcworkspace/xcuserdata
.DS_Store
include/.DS_Store
._.DS_Store
**/.DS_Store
**/._.DS_Store
1 change: 0 additions & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ target 'iTorrent' do
use_frameworks!

# Pods for iTorrent
pod 'MaterialComponents/Snackbar'
pod 'Firebase/Core'
pod 'Firebase/Performance'
pod 'Fabric', '~> 1.7.7'
Expand Down
126 changes: 0 additions & 126 deletions Podfile.lock

This file was deleted.

Binary file removed Pods/.DS_Store
Binary file not shown.
126 changes: 0 additions & 126 deletions Pods/Manifest.lock

This file was deleted.

Loading

0 comments on commit a382da2

Please sign in to comment.