ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-09-03 11:21:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/iOS9-Updates

Browse Source
This commit is contained in:
Andreas Linde 2015-08-13 13:52:24 +02:00
commit c19e83f6b0
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Classes/BITFeedbackManager.h
View File

@ -228,7 +228,6 @@ typedef NS_ENUM(NSInteger, BITFeedbackObservationMode) {
All NSString-Content in the array will be concatenated and result in the message,
while all UIImage and NSData-instances will be turned into attachments.
@param items an NSArray with objects that should be attached
@see `[BITFeedbackComposeViewController prepareWithItems:]`
*/
@property (nonatomic, copy) NSArray *feedbackComposerPreparedItems;

10
README.md
View File

@ -36,7 +36,8 @@ This document contains the following sections:
9. [Debug information](#debug)
4. [Documentation](#documentation)
5. [Contributing](#contributing)
6. [Contact](#contact)
6. [Contributor License](#contributorlicense)
7. [Contact](#contact)
<a id="requirements"></a>
## 1. Requirements
@ -452,7 +453,12 @@ We're looking forward to your contributions via pull requests.
* [AppleDoc](https://github.com/tomaz/appledoc)
* [Cocoapods](https://cocoapods.org/)
<a id="contributorlicense"></a>
## 6. Contributor License
You must sign a [Contributor License Agreement](https://cla.microsoft.com/) before submitting your pull request. To complete the Contributor License Agreement (CLA), you will need to submit a request via the [form](https://cla.microsoft.com/) and then electronically sign the CLA when you receive the email containing the link to the document. You need to sign the CLA only once to cover submission to any Microsoft OSS project.
<a id="contact"></a>
## 6. Contact
## 7. Contact
If you have further questions or are running into trouble that cannot be resolved by any of the steps here, feel free to open a Github issue here or contact us at [support@hockeyapp.net](mailto:support@hockeyapp.net)

10
docs/Guide-Installation-Setup-template.md
View File

@ -20,7 +20,8 @@ This document contains the following sections:
9. [Debug information](#debug)
4. [Documentation](#documentation)
5. [Contributing](#contributing)
6. [Contact](#contact)
6. [Contributor License](#contributorlicense)
7. [Contact](#contact)
<a id="requirements"></a>
## 1. Requirements
@ -437,7 +438,12 @@ We're looking forward to your contributions via pull requests.
* [AppleDoc](https://github.com/tomaz/appledoc)
* [Cocoapods](https://cocoapods.org/)
<a id="contributorlicense"></a>
## 6. Contributor License
You must sign a [Contributor License Agreement](https://cla.microsoft.com/) before submitting your pull request. To complete the Contributor License Agreement (CLA), you will need to submit a request via the [form](https://cla.microsoft.com/) and then electronically sign the CLA when you receive the email containing the link to the document. You need to sign the CLA only once to cover submission to any Microsoft OSS project.
<a id="contact"></a>
## 6. Contact
## 7. Contact
If you have further questions or are running into trouble that cannot be resolved by any of the steps here, feel free to open a Github issue here or contact us at [support@hockeyapp.net](mailto:support@hockeyapp.net)