Skip to content

Commit

Permalink
Merge branch 'release/3.2.1-31'
Browse files Browse the repository at this point in the history
  • Loading branch information
jnavarrom committed Jul 21, 2016
2 parents c0558fd + 3208cb7 commit 540b1bc
Show file tree
Hide file tree
Showing 136 changed files with 4,855 additions and 4,312 deletions.
5 changes: 4 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@
url = https://github.com/tagyro/AMLocalizedString.git
[submodule "iMEGA/Vendor/CTAssetsPickerController"]
path = iMEGA/Vendor/CTAssetsPickerController
url = https://github.com/meganz/CTAssetsPickerController.git
url = https://github.com/chiunam/CTAssetsPickerController.git
[submodule "iMEGA/Vendor/DateTools"]
path = iMEGA/Vendor/DateTools
url = https://github.com/MatthewYork/DateTools.git
[submodule "iMEGA/Vendor/PureLayout"]
path = iMEGA/Vendor/PureLayout
url = https://github.com/smileyborg/PureLayout
Binary file removed Crashlytics.framework/Crashlytics
Binary file not shown.
31 changes: 0 additions & 31 deletions Crashlytics.framework/Headers/ANSCompatibility.h

This file was deleted.

210 changes: 0 additions & 210 deletions Crashlytics.framework/Headers/Answers.h

This file was deleted.

33 changes: 0 additions & 33 deletions Crashlytics.framework/Headers/CLSAttributes.h

This file was deleted.

64 changes: 0 additions & 64 deletions Crashlytics.framework/Headers/CLSLogging.h

This file was deleted.

Loading

0 comments on commit 540b1bc

Please sign in to comment.