Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
lfarah authored Dec 7, 2017
2 parents 5a1a24b + a8e3c4e commit 51f674f
Show file tree
Hide file tree
Showing 4 changed files with 148 additions and 99 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Typical reasons for deleting project:

- Lack recent commit
- Don't support iOS 9 or later
- Don't support Swift 3 or later
- Don't support Swift 4 or later
- Not written in English
- README is not clear

Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
- [ ] Only one project/change is in this pull request
- [ ] Addition in chronological order (bottom of category)
- [ ] Supports iOS 9 / tvOS 10 or later
- [ ] Supports Swift 3 or later
- [ ] Supports Swift 4 or later
- [ ] Has a commit from less than 2 years ago
- [ ] Has a **clear** README in English
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ before_script:
- gem install danger
script:
- allowed_dupes=CONTRIBUTING,mocaplatform,Awesome-Swift-Education,XCDYouTubeKit,SRGMediaPlayer,PayPal-iOS-SDK,PerfectlySoft
- allowed_redirects=growthpush,awesomelinkcounter,eepurl,bluemix,amazon
- allowed_redirects=growthpush,awesomelinkcounter,eepurl,bluemix,amazon,facebook.com/groups
- awesome_bot README.md --allow-ssl --white-list $allowed_dupes,$allowed_redirects
- danger
notifications:
Expand Down
Loading

0 comments on commit 51f674f

Please sign in to comment.