3. Fork the Friendica repository from [https://github.com/friendica/friendica.git](https://github.com/friendica/friendica.git).
4. Clone your fork from your GitHub account to your machine.
Follow the instructions provided here: [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/) to create and use your own tracking fork on GitHub
-5. Run `util/composer.phar install` in Friendica's folder.
+5. Run `bin/composer.phar install` in Friendica's folder.
6. Commit your changes to your fork.
Then go to your GitHub page and create a "Pull request" to notify us to merge your work.
There are two relevant branches in the main repo on GitHub:
-1. master: This branch contains stable releases only.
+1. stable: This branch contains stable releases only.
2. develop: This branch contains the latest code.
This is what you want to work with.
A release branch is created when the develop branch contains all features it should have.
A release branch is used for a few things.
-1. It allows last-minute bug fixing before the release goes to master branch.
+1. It allows last-minute bug fixing before the release goes to stable branch.
2. It allows meta-data changes (README, CHANGELOG, etc.) for version bumps and documentation changes.
3. It makes sure the develop branch can receive new features that are **not** part of this release.
3. Check your code for typos.
There is a console command called *typo* for this.
- $> php bin/console typo
+ $> php bin/console.php typo
Check out how to work with [our Vagrant](help/Vagrant) to save a lot of setup time!