File tree Expand file tree Collapse file tree 3 files changed +3
-3
lines changed Expand file tree Collapse file tree 3 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -52,7 +52,7 @@ and squashed into a minimal set of commits. Each commit should include
52
52
the necessary code, test, and documentation changes for a single "piece"
53
53
of functionality.
54
54
55
- To be mergable , patches must:
55
+ To be mergeable , patches must:
56
56
57
57
- be rebased onto the latest master,
58
58
- be automatically mergeable,
Original file line number Diff line number Diff line change @@ -52,7 +52,7 @@ and squashed into a minimal set of commits. Each commit should include
52
52
the necessary code, test, and documentation changes for a single "piece"
53
53
of functionality.
54
54
55
- To be mergable , patches must:
55
+ To be mergeable , patches must:
56
56
57
57
- be rebased onto the latest master,
58
58
- be automatically mergeable,
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ Although :doc:`WaffleJS<javascript>` returns the status of all
9
9
:ref: `samples <types-sample >`, it does so by exposing a Javascript
10
10
object, rather than returning the data in a directly consumable format.
11
11
12
- In cases where a directly consumable format is preferrable ,
12
+ In cases where a directly consumable format is preferable ,
13
13
Waffle also exposes this data as JSON via the ``waffle_status `` view.
14
14
15
15
You can’t perform that action at this time.
0 commit comments