Commit graph

4 commits

Author SHA1 Message Date
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
Pacman99 fe3a624930 docs: general updates 2021-06-05 10:10:05 -07:00
Pacman99 ffe4836e35 update doc to match new template format and logic 2021-04-26 18:29:05 -07:00
Timothy DeHerrera 2d91946745
doc: move all docs under doc 2021-04-18 20:42:49 -06:00