Commit 136e0973 authored by Nathaniel Wesley Filardo's avatar Nathaniel Wesley Filardo
Browse files

Merge dev into release

While we intend our release strategy to be that we just fast-forward our
`release` branch to `dev`, things have come a little off the wheels.
This is a "git merge -s recursive -X theirs" of `dev` into `release`
instead.
parents 4f679277 c212b30a
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -105,6 +105,7 @@ pages: ...@@ -105,6 +105,7 @@ pages:
- 'pcm' : 'modules/pcm.md' - 'pcm' : 'modules/pcm.md'
- 'perf': 'modules/perf.md' - 'perf': 'modules/perf.md'
- 'pipe': 'modules/pipe.md' - 'pipe': 'modules/pipe.md'
- 'pixbuf': 'modules/pixbuf.md'
- 'pwm' : 'modules/pwm.md' - 'pwm' : 'modules/pwm.md'
- 'pwm2' : 'modules/pwm2.md' - 'pwm2' : 'modules/pwm2.md'
- 'rfswitch' : 'modules/rfswitch.md' - 'rfswitch' : 'modules/rfswitch.md'
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment