Merge branch 'master' into creds

Began writing permissioning info
2 changed files with 6 additions and 0 deletions
--- a/docs/drafts/permissioning.md
+++ b/docs/drafts/permissioning.md
@ -0,0 +1,4 @@
+# Permissioning
+
+
+
--- a/mkdocs.yml
+++ b/mkdocs.yml
@ -23,6 +23,8 @@ nav:
        - Docs: 'web/docs.md'
        - Gitea: 'web/gitea.md'
        - Eldoom: 'web/eldoom.md'
+    - Drafts:
+        - Permissioning: 'drafts/permissioning.md'

 markdown_extensions:
    - admonition
Author	SHA1	Message	Date
cameron	2972781215	Merge branch 'master' into creds	2 years ago
Thomas Johnson	6b93f4e874	Began writing permissioning info	2 years ago