diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2018-06-19 15:02:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-19 15:02:43 +0200 |
| commit | 56c58c6f64bf9b123201da4a542ca00b334162c0 (patch) | |
| tree | 153e2899a47a25e2c4915001d058347f0fea02a4 /CONTRIBUTING.adoc | |
| parent | 2ca1b16a0910ec4890c504ce01e54161038a03e4 (diff) | |
| parent | cf23391c408712f65c9e65a8187d1c00d16c30de (diff) | |
| download | meta-updater-56c58c6f64bf9b123201da4a542ca00b334162c0.tar.gz | |
Merge pull request #339 from advancedtelematic/bugfix/staging_dir_host_master
Bugfix/staging dir host master
Diffstat (limited to 'CONTRIBUTING.adoc')
| -rw-r--r-- | CONTRIBUTING.adoc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index df7a717..93a0815 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | = Contributing | 1 | = Contributing |
| 2 | 2 | ||
| 3 | We welcome pull requests from everyone. It may be helpful to read the README and other documentation for link:README.adoc[this repo], https://github.com/advancedtelematic/aktualizr[aktualizr], and the https://github.com/advancedtelematic/updater-repo/[updater-repo], particularly the sections and development and debugging. | 3 | We welcome pull requests from anyone. The master branch is the primary branch for development, and if you wish to add new functionality, it probably belongs there. We attempt to maintain recent previous branches and welcome bug fixes and backports for those. Currently, the actively maintained branches are sumo, rocko, and pyro. Previously, morty was also a stable branch, but it has not been updated or actively maintained for a while. |
| 4 | 4 | ||
| 5 | If you are developing with meta-updater, it may be helpful to read the README and other documentation for link:README.adoc[this repo], https://github.com/advancedtelematic/aktualizr[aktualizr], and the https://github.com/advancedtelematic/updater-repo/[updater-repo], particularly the sections about development and debugging. | ||