Merge branch 'master' into Storce-patch-7

ocf · Sep 23, 2024 · 4646eb0 · 4646eb0
2 parents 25d8a71 + fa8c0af
commit 4646eb0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/configs/vhost-mail.conf b/configs/vhost-mail.conf
@@ -6,6 +6,8 @@ ggroup vhost.berkeley.edu
 ggroup dev-vhost.ocf.berkeley.edu
 ggroup dev-dev-vhost.ocf.berkeley.edu
 
+# rt#14441 by storce
+notion notion.studentorg.berkeley.edu
 
 # rt#14264 by storce
 gfb basis.studentorg.berkeley.edu

diff --git a/configs/vhost.conf b/configs/vhost.conf
@@ -16,9 +16,13 @@
 #             This field can be ommitted entirely (no dash needed).
 #
 # (use dashes to omit a field)
+
 # staff-hour by storce
 edrl edrl.berkeley.edu - -
 
+# rt#13814 by storce
+spfndn springfoundation.studentorg.berkeley.edu - -
+
 # rt#14041 by storce 
 airbears skydiving.studentorg.berkeley.edu - -