diff options
| author | manuroe <manu@matrix.org> | 2016-09-27 08:30:33 +0200 |
|---|---|---|
| committer | manuroe <manu@matrix.org> | 2016-09-27 08:30:33 +0200 |
| commit | 1d06f2a4d9565c332081bc685edd8fd61d6507ef (patch) | |
| tree | ce61f13c9347786276238fc36e34dde4d5d32f5a /xcode/Podfile.lock | |
| parent | 8a8d100ee5be5961861e53f8b3b5702e8902af74 (diff) | |
| parent | daab2a58af947cddd67fe9f30dd3a9fc327650c0 (diff) | |
Merge remote-tracking branch 'OLMKit/olmkit' into olmkit
# Conflicts:
# .gitignore
# include/olm/olm.hh
# javascript/README.md
Diffstat (limited to 'xcode/Podfile.lock')
| -rw-r--r-- | xcode/Podfile.lock | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/xcode/Podfile.lock b/xcode/Podfile.lock new file mode 100644 index 0000000..4639dc0 --- /dev/null +++ b/xcode/Podfile.lock @@ -0,0 +1,14 @@ +PODS: + - olm (0.1.0) + +DEPENDENCIES: + - olm (from `../olm.podspec`) + +EXTERNAL SOURCES: + olm: + :path: "../olm.podspec" + +SPEC CHECKSUMS: + olm: ba8c1a7ca04486ec1ad958ec9feef73c0939ae27 + +COCOAPODS: 0.39.0 |