Skip to content

Commit 7905490

Browse files
committed
Merge branch 'master' into dev
2 parents a98db5c + d9ad111 commit 7905490

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

.github/workflows/ci.yml

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
- dev
88
- master
99
- extended
10+
- extended-dev
11+
- extended-refactor
1012
- '**-feature-**'
1113
paths-ignore:
1214
- 'README.md'
@@ -21,6 +23,8 @@ on:
2123
- dev
2224
- master
2325
- extended
26+
- extended-dev
27+
- extended-refactor
2428
- '**-feature-**'
2529
paths-ignore:
2630
- 'README.md'

README.md

+12-8
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,21 @@ This is the SHA fingerprint of LastPipeBender's signing key to verify downloaded
4646
title: Project Management
4747
---
4848
graph TD
49-
A[NewPipe] --> D[dev]
50-
B[Tubular] --> D
51-
C[features from other forks/apps] --> | review | F
49+
B([Tubular]) --> D
50+
A([NewPipe]) --> D[dev]
51+
C([features from other forks/apps]) --> | review | F
5252
D --> | test & mini changes | E[master]
53-
D --> X[unique features]
54-
X --> | review | F[extended]
53+
D --> | unique features | F[extended-dev]
5554
56-
F --> G(Extended Version)
55+
G .-> | ensure long-term compatibility | E
56+
E --> K>Stable Version]
5757
58-
F --> | ensure long-term compatibility | E
59-
E --> K(Stable Version)
58+
F --> | review | G[extended]
59+
G --> H>Extended Version]
60+
61+
F --> P[extended-refactor]
62+
A --> | refactor branch changes | P
63+
P --> Y>Refactor Build - WIP]
6064
```
6165

6266
## License

0 commit comments

Comments
 (0)