Skip to content

Commit

Permalink
Renamed all remaining mentions of develop branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
Marnix Rijnart committed Apr 2, 2021
1 parent 00ff7c3 commit 2c65f5c
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 6 deletions.
2 changes: 0 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ We welcome volunteers to contribute to the Wikipedia iOS app codebase.
## Development instructions
Before developing, please read the [setup instructions](README.md).

We do all of our active development on the [develop](https://github.com/wikimedia/wikipedia-ios) branch. Your pull requests will automatically be targeted at that branch by Github. To make merging easier, be sure you create your branches based on the develop branch.

Once your contributions are ready for review, add yourself in alphabetical order under contributors in `Code/AboutViewController.plist` and post a pull request on GitHub. One of the maintainers will review the PR. Thanks for contributing! 🎉

## What can I work on?
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
The official Wikipedia iOS app.

[![Wikipedia](https://circleci.com/gh/wikimedia/wikipedia-ios.svg?style=shield)](https://github.com/wikimedia/wikipedia-ios)
[![MIT license](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://raw.githubusercontent.com/wikimedia/wikipedia-ios/develop/LICENSE.txt)
[![MIT license](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://raw.githubusercontent.com/wikimedia/wikipedia-ios/main/LICENSE.txt)

* License: MIT License
* Source repo: https://github.com/wikimedia/wikipedia-ios
Expand Down
2 changes: 1 addition & 1 deletion Wikipedia/Code/AboutViewController.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>sharealike</key>
<string>https://creativecommons.org/licenses/by-sa/3.0/</string>
<key>mit</key>
<string>https://raw.githubusercontent.com/wikimedia/wikipedia-ios/develop/LICENSE.txt</string>
<string>https://raw.githubusercontent.com/wikimedia/wikipedia-ios/main/LICENSE.txt</string>
<key>tsg</key>
<string>https://tsgteam.org</string>
<key>feedback</key>
Expand Down
2 changes: 1 addition & 1 deletion fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ platform :ios do
ensure_git_status_clean if ENV['FL_ENSURE_CLEAN']
end

desc "Checks out the sha specified in the environment variables or the develop branch"
desc "Checks out the sha specified in the environment variables or the main branch"
lane :checkout do
sha = ENV['SHA']
if sha != nil
Expand Down
2 changes: 1 addition & 1 deletion fastlane/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ or alternatively using `brew install fastlane`
```
fastlane ios checkout
```
Checks out the sha specified in the environment variables or the develop branch
Checks out the sha specified in the environment variables or the main branch
### ios analyze
```
fastlane ios analyze
Expand Down

0 comments on commit 2c65f5c

Please sign in to comment.