 teutat3s
|
0629024cf5
|
chore: clean up after upstream updates
|
2022-02-02 03:33:20 +01:00 |
|
|
teutat3s
|
134fcb9a0d
|
fix/upstreaming-merge-conflicts (#42)
Co-authored-by: Anton <fetsorn@gmail.com>
Co-authored-by: Chris Montgomery <chris@cdom.io>
Co-authored-by: Timothy DeHerrera <tim.deh@pm.me>
Co-authored-by: Parthiv Seetharaman <pachum99@myrdd.info>
Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
Co-authored-by: GTrunSec <gtrunsec@hardenedlinux.org>
Co-authored-by: Pacman99 <pachum99@myrdd.info>
Co-authored-by: Joel <joel@joel.tokyo>
Co-authored-by: Trevor Riles <trevor@trevorriles.com>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/42
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
|
2021-10-11 22:32:01 +00:00 |
|
|
teutat3s
|
e833c6cdae
|
fix/merge-conflict (#36)
Co-authored-by: Anton <fetsorn@gmail.com>
Co-authored-by: Chris Montgomery <chris@cdom.io>
Co-authored-by: Timothy DeHerrera <tim.deh@pm.me>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/36
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
|
2021-10-07 23:53:20 +00:00 |
|
David Arnold
|
2fcb3605ee
|
docs: soft update (fix the most obvious drift)
|
2021-08-01 16:38:52 -05:00 |
|