aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/twbs/bootstrap/.github/CONTRIBUTING.md
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2020-08-22 19:40:57 +0200
committerMario Vavti <mario@mariovavti.com>2020-08-22 19:40:57 +0200
commita9e19cb89ed08689dc58c92b3d5491318a703f0e (patch)
tree468e236e5cb4927a4fd01f650fab7ad9f6cfc895 /vendor/twbs/bootstrap/.github/CONTRIBUTING.md
parent48786119871aaf1029fac12a37d212afddafc757 (diff)
downloadvolse-hubzilla-a9e19cb89ed08689dc58c92b3d5491318a703f0e.tar.gz
volse-hubzilla-a9e19cb89ed08689dc58c92b3d5491318a703f0e.tar.bz2
volse-hubzilla-a9e19cb89ed08689dc58c92b3d5491318a703f0e.zip
composer update bootstrap
Diffstat (limited to 'vendor/twbs/bootstrap/.github/CONTRIBUTING.md')
-rw-r--r--vendor/twbs/bootstrap/.github/CONTRIBUTING.md16
1 files changed, 8 insertions, 8 deletions
diff --git a/vendor/twbs/bootstrap/.github/CONTRIBUTING.md b/vendor/twbs/bootstrap/.github/CONTRIBUTING.md
index 6cd59b59b..2519be0d8 100644
--- a/vendor/twbs/bootstrap/.github/CONTRIBUTING.md
+++ b/vendor/twbs/bootstrap/.github/CONTRIBUTING.md
@@ -65,7 +65,7 @@ Guidelines for bug reports:
reported.
2. **Check if the issue has been fixed** &mdash; try to reproduce it using the
- latest `master` or development branch in the repository.
+ latest `master` or `v4-dev` branch in the repository.
3. **Isolate the problem** &mdash; ideally create a [reduced test
case](https://css-tricks.com/reduced-test-cases/) and a live example.
@@ -135,12 +135,12 @@ project (indentation, accurate comments, etc.) and any other requirements
**Do not edit `bootstrap.css`, or `bootstrap.js`
directly!** Those files are automatically generated. You should edit the
-source files in [`/bootstrap/scss/`](https://github.com/twbs/bootstrap/tree/master/scss)
-and/or [`/bootstrap/js/src/`](https://github.com/twbs/bootstrap/tree/master/js/src) instead.
+source files in [`/bootstrap/scss/`](https://github.com/twbs/bootstrap/tree/v4-dev/scss)
+and/or [`/bootstrap/js/src/`](https://github.com/twbs/bootstrap/tree/v4-dev/js/src) instead.
Similarly, when contributing to Bootstrap's documentation, you should edit the
documentation source files in
-[the `/bootstrap/site/docs/` directory of the `master` branch](https://github.com/twbs/bootstrap/tree/master/site/docs).
+[the `/bootstrap/site/docs/` directory of the `v4-dev` branch](https://github.com/twbs/bootstrap/tree/v4-dev/site/docs).
**Do not edit the `gh-pages` branch.** That branch is generated from the
documentation source files and is managed separately by the Bootstrap Core Team.
@@ -162,8 +162,8 @@ included in the project:
2. If you cloned a while ago, get the latest changes from upstream:
```bash
- git checkout master
- git pull upstream master
+ git checkout v4-dev
+ git pull upstream v4-dev
```
3. Create a new topic branch (off the main project development branch) to
@@ -182,7 +182,7 @@ included in the project:
5. Locally merge (or rebase) the upstream development branch into your topic branch:
```bash
- git pull [--rebase] upstream master
+ git pull [--rebase] upstream v4-dev
```
6. Push your topic branch up to your fork:
@@ -192,7 +192,7 @@ included in the project:
```
7. [Open a Pull Request](https://help.github.com/articles/about-pull-requests/)
- with a clear title and description against the `master` branch.
+ with a clear title and description against the `v4-dev` branch.
**IMPORTANT**: By submitting a patch, you agree to allow the project owners to
license your work under the terms of the [MIT License](../LICENSE) (if it