Merge remote-tracking branch 'origin/master' into master

3 years ago · 059e4b4a20
parent 6665b586cb
commit 059e4b4a20
1 changed files with 1 additions and 2 deletions
--- a/code/home
+++ b/code/home
@ -1,2 +1 @@
-hahaha???
-get from version control
+ntrol