Commit 69774f66 authored by Davide De Rosa's avatar Davide De Rosa
Browse files

Merge branch 'develop' into 'master'

2.6 Beta 1
parents f06079e0 4057a68e
......@@ -51,7 +51,7 @@ end
def shared_main_pods
pod 'AlamofireImage'
#library_by_path('..')
library_by_git('0d1fbb3')
library_by_git('a70529a23fc5a281285fb203645a826520ac5227')
#library_by_version('1.0')
end
......
......@@ -49,10 +49,10 @@ DEPENDENCIES:
- HockeySDK
- iRate
- MBProgressHUD
- PIALibrary/Library (from `https://github.com/pia-foss/client-library-apple`, commit `0d1fbb3`)
- PIALibrary/Mock (from `https://github.com/pia-foss/client-library-apple`, commit `0d1fbb3`)
- PIALibrary/UI (from `https://github.com/pia-foss/client-library-apple`, commit `0d1fbb3`)
- PIALibrary/VPN (from `https://github.com/pia-foss/client-library-apple`, commit `0d1fbb3`)
- PIALibrary/Library (from `https://github.com/pia-foss/client-library-apple`, commit `a70529a23fc5a281285fb203645a826520ac5227`)
- PIALibrary/Mock (from `https://github.com/pia-foss/client-library-apple`, commit `a70529a23fc5a281285fb203645a826520ac5227`)
- PIALibrary/UI (from `https://github.com/pia-foss/client-library-apple`, commit `a70529a23fc5a281285fb203645a826520ac5227`)
- PIALibrary/VPN (from `https://github.com/pia-foss/client-library-apple`, commit `a70529a23fc5a281285fb203645a826520ac5227`)
- PIATunnel (from `https://github.com/pia-foss/tunnel-apple`, commit `b976f5e`)
- SideMenu (= 3.1.5)
- TPKeyboardAvoiding
......@@ -74,7 +74,7 @@ SPEC REPOS:
EXTERNAL SOURCES:
PIALibrary:
:commit: 0d1fbb3
:commit: a70529a23fc5a281285fb203645a826520ac5227
:git: https://github.com/pia-foss/client-library-apple
PIATunnel:
:commit: b976f5e
......@@ -82,7 +82,7 @@ EXTERNAL SOURCES:
CHECKOUT OPTIONS:
PIALibrary:
:commit: 0d1fbb3
:commit: a70529a23fc5a281285fb203645a826520ac5227
:git: https://github.com/pia-foss/client-library-apple
PIATunnel:
:commit: b976f5e
......@@ -104,6 +104,6 @@ SPEC CHECKSUMS:
SwiftyBeaver: 85daaaa2b3ae6e31b7b55c99430e8b91dac088af
TPKeyboardAvoiding: cb69d5ddbe90ce0170e4bc2db1e5e41d4a3ad9a4
PODFILE CHECKSUM: bd4219576bbdb1814bb78a105982426d90772340
PODFILE CHECKSUM: 00c756c8c481bda563d7cad9e88281135903bc11
COCOAPODS: 1.5.2
- Added a screen to redeem gift/trial cards.
- Improved automatic server selection.
- Added "Reset settings" feature.
- Improved OpenVPN stability.
- Added missing translations.
Supports Markdown
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