Merge branch 'master' of github.com:flancian/garden

This commit is contained in:
2021-11-23 10:36:01 +01:00
3 changed files with 19 additions and 15 deletions
+11 -11
View File
@@ -1,17 +1,17 @@
# Dyokomizo # Dyokomizo
- A [[person]], mostly. - a [[person]].
- [[zen]] practitioner. [[programmer]]/tech worker. [[brazilian]].
- [[twitter]] https://twitter.com/dyokomizo
- Self describes as "human being, most of the time" - Self describes as "human being, most of the time"
- [[twitter]]. Zen practitioner. Programmer/tech worker. Brazilian. - [[medium]] https://medium.com/@dyokomizo
- Good overlap. - [[review]] https://www.reddit.com/r/BlackSwanDAO/comments/iisf5o/initial_draft_of_new_governance_documents/
- [[doc]] https://flancia.org/go/dyokomizo-flancian - [[meditation]] https://docs.google.com/document/d/1ptGnu-hbEFOXKCrYlL1hsaG12CJfl2yGHyy0GtOvWfc/edit
- [[medium]] https://medium.com/@dyokomizo
- [[review]] https://www.reddit.com/r/BlackSwanDAO/comments/iisf5o/initial_draft_of_new_governance_documents/
- [[meditation]] https://docs.google.com/document/d/1ptGnu-hbEFOXKCrYlL1hsaG12CJfl2yGHyy0GtOvWfc/edit
- guided meditations of __Tara__Brach: https://www.tarabrach.com/guided-meditations/ - guided meditations of __Tara__Brach: https://www.tarabrach.com/guided-meditations/
- Told me about [[implementation intention]] - Told me about [[implementation intention]]
- [[blag]] https://github.com/dyokomizo/blag/issues - [[blag]] https://github.com/dyokomizo/blag/issues
- One of [[explorer]] [[achiever]] - [[doc]] https://flancia.org/go/dyokomizo-flancian
- One of [[explorer]] [[achiever]]
- https://twitter.com/dyokomizo/status/1312084291443097601 - https://twitter.com/dyokomizo/status/1312084291443097601
- https://twitter.com/dyokomizo/status/1304416612968169472 - https://twitter.com/dyokomizo/status/1304416612968169472
+4
View File
@@ -1,4 +1,8 @@
# 2021-11-22 # 2021-11-22
<<<<<<< HEAD
- [[dyokomizo]]
=======
- [[protopoi]] - [[protopoi]]
- [[arth-goldau]] - [[arth-goldau]]
>>>>>>> 95a3576d3c9f53acb68e776aafc3de56392dbc2c
+1 -1
View File
@@ -3,7 +3,7 @@
- A [[person]]. - A [[person]].
- [[author]] [[pull]] [[rokos basilisk]] - [[author]] [[pull]] [[rokos basilisk]]
- [[pull]] [[roko mijic]] [[rokomijikuk]] - [[pull]] [[roko mijic]] [[rokomijikuk]]
- [[twitter]] twitter.com/rokomijikuk - [[twitter]] twitter.com/rokomijic
- Strong opions, I often disagree with him but find him [[interesting]]. - Strong opions, I often disagree with him but find him [[interesting]].