Merge remote-tracking branch 'public/master' into 3.0.x

This commit is contained in:
Gautier Pelloux-Prayer 2015-10-20 12:05:55 +02:00
commit e3ce60f9f8
19 changed files with 3 additions and 3 deletions

View file

@ -53,7 +53,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>2.4.1</string>
<string>2.4.3</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIApplicationExitsOnSuspend</key>

@ -1 +1 @@
Subproject commit 39bc0ebcebe3485b5cfcacbbe22092eeb97997a0
Subproject commit b15272b1bc3394ae5ed06300bd5babd05a4a94db

@ -1 +1 @@
Subproject commit dae216855ca67430cc25135f4eef52f1e5edc1c2
Subproject commit c10bceadcbe0ab668d07fbb539a435bf9e0ebebe