Commit 140082d0 authored by Davide De Rosa's avatar Davide De Rosa
Browse files

Merge branch 'develop' into 'master'

QA: 2.6 Beta 6
parents e5e92aba f6c0db0e
......@@ -51,7 +51,7 @@ end
def shared_main_pods
pod 'AlamofireImage'
#library_by_path('..')
library_by_git('f290ff9')
library_by_git('7feb16e')
#library_by_version('1.0')
end
......@@ -66,7 +66,7 @@ end
def tunnel_pods
#tunnel_by_path('..')
tunnel_by_git('013d2d0')
tunnel_by_git('216ef12')
#tunnel_by_version('1.0')
end
......
......@@ -52,11 +52,11 @@ DEPENDENCIES:
- HockeySDK
- iRate
- MBProgressHUD
- PIALibrary/Library (from `https://github.com/pia-foss/client-library-apple`, commit `f290ff9`)
- PIALibrary/Mock (from `https://github.com/pia-foss/client-library-apple`, commit `f290ff9`)
- PIALibrary/UI (from `https://github.com/pia-foss/client-library-apple`, commit `f290ff9`)
- PIALibrary/VPN (from `https://github.com/pia-foss/client-library-apple`, commit `f290ff9`)
- PIATunnel (from `https://github.com/pia-foss/tunnel-apple`, commit `013d2d0`)
- PIALibrary/Library (from `https://github.com/pia-foss/client-library-apple`, commit `7feb16e`)
- PIALibrary/Mock (from `https://github.com/pia-foss/client-library-apple`, commit `7feb16e`)
- PIALibrary/UI (from `https://github.com/pia-foss/client-library-apple`, commit `7feb16e`)
- PIALibrary/VPN (from `https://github.com/pia-foss/client-library-apple`, commit `7feb16e`)
- PIATunnel (from `https://github.com/pia-foss/tunnel-apple`, commit `216ef12`)
- SideMenu (= 3.1.5)
- TPKeyboardAvoiding
......@@ -78,18 +78,18 @@ SPEC REPOS:
EXTERNAL SOURCES:
PIALibrary:
:commit: f290ff9
:commit: 7feb16e
:git: https://github.com/pia-foss/client-library-apple
PIATunnel:
:commit: 013d2d0
:commit: 216ef12
:git: https://github.com/pia-foss/tunnel-apple
CHECKOUT OPTIONS:
PIALibrary:
:commit: f290ff9
:commit: 7feb16e
:git: https://github.com/pia-foss/client-library-apple
PIATunnel:
:commit: 013d2d0
:commit: 216ef12
:git: https://github.com/pia-foss/tunnel-apple
SPEC CHECKSUMS:
......@@ -109,6 +109,6 @@ SPEC CHECKSUMS:
SwiftyBeaver: 25bd76281f49ca989ec2e3cbde9af89c15bc1432
TPKeyboardAvoiding: cb69d5ddbe90ce0170e4bc2db1e5e41d4a3ad9a4
PODFILE CHECKSUM: 9a560351dda7abf099b79cbabad0476ffe0ff31a
PODFILE CHECKSUM: b115770c5cd4c3df7e12e2c633647bc13cdd435e
COCOAPODS: 1.5.2
Critical fix in 9213 and above:
- Fixed a regression in which a connection timeout in OpenVPN would instead result in a successful attempt, thus showing the app erroneously connected to the VPN.
Changelog:
- Added a screen to redeem gift/trial cards.
- Improved automatic server selection.
- Added "Reset settings" feature.
- Improved OpenVPN stability.
- Added missing translations.
Important fix in 9213:
- Fixed a regression in which a connection timeout in OpenVPN would instead result in a successful attempt, thus showing the app erroneously connected to the VPN.
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