Merge branch 'master' into 'my-remote'

# Conflicts: # config.org # init.el
2021-03-01 21:49:04 +00:00 · 2021-03-01 21:49:04 +00:00 · 333b58ecbd
parent 567dd71015 d5d73ff33f
commit 333b58ecbd
1 changed files with 1 additions and 0 deletions
--- a/README.org
+++ b/README.org
@ -0,0 +1 @@
+config.org