Merge branch 'Next'

apptentive · Sep 18, 2015 · 77e6bdb · 77e6bdb
2 parents bfb88dd + dcb8032
commit 77e6bdb
Show file tree

Hide file tree

Showing 38 changed files with 191 additions and 219 deletions.
diff --git a/ApptentiveConnect/ApptentiveConnect.xcodeproj/project.pbxproj b/ApptentiveConnect/ApptentiveConnect.xcodeproj/project.pbxproj
diff --git a/ApptentiveConnect/resources/Images.xcassets/Contents.json b/ApptentiveConnect/resources/Images.xcassets/Contents.json
diff --git a/ApptentiveConnect/resources/Images.xcassets/at_account.imageset/Contents.json b/ApptentiveConnect/resources/Images.xcassets/at_account.imageset/Contents.json
diff --git a/ApptentiveConnect/resources/Images.xcassets/at_account.imageset/at_account.png b/ApptentiveConnect/resources/Images.xcassets/at_account.imageset/at_account.png
diff --git a/ApptentiveConnect/resources/Images.xcassets/at_account.imageset/at_account@2x.png b/ApptentiveConnect/resources/Images.xcassets/at_account.imageset/at_account@2x.png
diff --git a/ApptentiveConnect/resources/Images.xcassets/at_account.imageset/at_account@3x.png b/ApptentiveConnect/resources/Images.xcassets/at_account.imageset/at_account@3x.png
diff --git a/ApptentiveConnect/resources/Images.xcassets/at_apptentive_logo.imageset/Contents.json b/ApptentiveConnect/resources/Images.xcassets/at_apptentive_logo.imageset/Contents.json
diff --git a/...ct/resources/Images.xcassets/at_apptentive_logo.imageset/at_apptentive_logo.png b/...ct/resources/Images.xcassets/at_apptentive_logo.imageset/at_apptentive_logo.png
diff --git a/...resources/Images.xcassets/at_apptentive_logo.imageset/at_apptentive_logo@2x.png b/...resources/Images.xcassets/at_apptentive_logo.imageset/at_apptentive_logo@2x.png
diff --git a/...resources/Images.xcassets/at_apptentive_logo.imageset/at_apptentive_logo@3x.png b/...resources/Images.xcassets/at_apptentive_logo.imageset/at_apptentive_logo@3x.png
diff --git a/ApptentiveConnect/resources/Images.xcassets/at_checkmark.imageset/Contents.json b/ApptentiveConnect/resources/Images.xcassets/at_checkmark.imageset/Contents.json
diff --git a/ApptentiveConnect/resources/Images.xcassets/at_checkmark.imageset/at_checkmark.png b/ApptentiveConnect/resources/Images.xcassets/at_checkmark.imageset/at_checkmark.png
diff --git a/...tiveConnect/resources/Images.xcassets/at_checkmark.imageset/at_checkmark@2x.png b/...tiveConnect/resources/Images.xcassets/at_checkmark.imageset/at_checkmark@2x.png
diff --git a/...tiveConnect/resources/Images.xcassets/at_checkmark.imageset/at_checkmark@3x.png b/...tiveConnect/resources/Images.xcassets/at_checkmark.imageset/at_checkmark@3x.png
diff --git a/ApptentiveConnect/resources/Images.xcassets/at_close.imageset/Contents.json b/ApptentiveConnect/resources/Images.xcassets/at_close.imageset/Contents.json
diff --git a/ApptentiveConnect/resources/Images.xcassets/at_close.imageset/at_close.png b/ApptentiveConnect/resources/Images.xcassets/at_close.imageset/at_close.png
diff --git a/ApptentiveConnect/resources/Images.xcassets/at_close.imageset/at_close@2x.png b/ApptentiveConnect/resources/Images.xcassets/at_close.imageset/at_close@2x.png
diff --git a/ApptentiveConnect/resources/Images.xcassets/at_close.imageset/at_close@3x.png b/ApptentiveConnect/resources/Images.xcassets/at_close.imageset/at_close@3x.png
diff --git a/ApptentiveConnect/resources/Images.xcassets/at_error_wait.imageset/Contents.json b/ApptentiveConnect/resources/Images.xcassets/at_error_wait.imageset/Contents.json
diff --git a/...ntiveConnect/resources/Images.xcassets/at_error_wait.imageset/at_error_wait.png b/...ntiveConnect/resources/Images.xcassets/at_error_wait.imageset/at_error_wait.png
diff --git a/...veConnect/resources/Images.xcassets/at_error_wait.imageset/at_error_wait@2x.png b/...veConnect/resources/Images.xcassets/at_error_wait.imageset/at_error_wait@2x.png
diff --git a/...veConnect/resources/Images.xcassets/at_error_wait.imageset/at_error_wait@3x.png b/...veConnect/resources/Images.xcassets/at_error_wait.imageset/at_error_wait@3x.png
diff --git a/ApptentiveConnect/resources/Images.xcassets/at_info.imageset/Contents.json b/ApptentiveConnect/resources/Images.xcassets/at_info.imageset/Contents.json
diff --git a/ApptentiveConnect/resources/Images.xcassets/at_info.imageset/at_info.png b/ApptentiveConnect/resources/Images.xcassets/at_info.imageset/at_info.png
diff --git a/ApptentiveConnect/resources/Images.xcassets/at_info.imageset/at_info@2x.png b/ApptentiveConnect/resources/Images.xcassets/at_info.imageset/at_info@2x.png
diff --git a/ApptentiveConnect/resources/Images.xcassets/at_info.imageset/at_info@3x.png b/ApptentiveConnect/resources/Images.xcassets/at_info.imageset/at_info@3x.png
diff --git a/ApptentiveConnect/resources/Images.xcassets/at_network_error.imageset/Contents.json b/ApptentiveConnect/resources/Images.xcassets/at_network_error.imageset/Contents.json
diff --git a/...onnect/resources/Images.xcassets/at_network_error.imageset/at_network_error.png b/...onnect/resources/Images.xcassets/at_network_error.imageset/at_network_error.png
diff --git a/...ect/resources/Images.xcassets/at_network_error.imageset/at_network_error@2x.png b/...ect/resources/Images.xcassets/at_network_error.imageset/at_network_error@2x.png
diff --git a/...ect/resources/Images.xcassets/at_network_error.imageset/at_network_error@3x.png b/...ect/resources/Images.xcassets/at_network_error.imageset/at_network_error@3x.png
diff --git a/ApptentiveConnect/resources/Images.xcassets/at_update_icon_mask.imageset/Contents.json b/ApptentiveConnect/resources/Images.xcassets/at_update_icon_mask.imageset/Contents.json
diff --git a/.../resources/Images.xcassets/at_update_icon_mask.imageset/at_update_icon_mask.png b/.../resources/Images.xcassets/at_update_icon_mask.imageset/at_update_icon_mask.png
diff --git a/...sources/Images.xcassets/at_update_icon_mask.imageset/at_update_icon_mask@2x.png b/...sources/Images.xcassets/at_update_icon_mask.imageset/at_update_icon_mask@2x.png
diff --git a/...sources/Images.xcassets/at_update_icon_mask.imageset/at_update_icon_mask@3x.png b/...sources/Images.xcassets/at_update_icon_mask.imageset/at_update_icon_mask@3x.png
diff --git a/ApptentiveConnect/resources/Images.xcassets/at_update_logo.imageset/Contents.json b/ApptentiveConnect/resources/Images.xcassets/at_update_logo.imageset/Contents.json
diff --git a/...iveConnect/resources/Images.xcassets/at_update_logo.imageset/at_update_logo.png b/...iveConnect/resources/Images.xcassets/at_update_logo.imageset/at_update_logo.png
diff --git a/...Connect/resources/Images.xcassets/at_update_logo.imageset/at_update_logo@2x.png b/...Connect/resources/Images.xcassets/at_update_logo.imageset/at_update_logo@2x.png
diff --git a/...Connect/resources/Images.xcassets/at_update_logo.imageset/at_update_logo@3x.png b/...Connect/resources/Images.xcassets/at_update_logo.imageset/at_update_logo@3x.png