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

This commit is contained in:
2021-12-22 21:56:01 +01:00
3 changed files with 20 additions and 1 deletions
+5
View File
@@ -1,5 +1,7 @@
# 2021-12-21 # 2021-12-21
- [[winter solstice]] is today!
- [[one hour for the revolution]]
- [[global risk]] - [[global risk]]
- [[winter solstice]] is today! - [[winter solstice]] is today!
- [[flancia]] - [[flancia]]
@@ -20,7 +22,10 @@
- [[vital876]] == [[vital]] - [[vital876]] == [[vital]]
- [[category]] - [[category]]
- [[categories]] - [[categories]]
<<<<<<< HEAD
- [[push]] [[2021-12-22]] - [[push]] [[2021-12-22]]
- write [[perhaps naive]] - write [[perhaps naive]]
- write [[the expanding circle]] - write [[the expanding circle]]
- write [[knowledge commons]] - write [[knowledge commons]]
=======
>>>>>>> 3c51dca78c02c1b172223462fdc7338598d32b31
+12
View File
@@ -1,3 +1,15 @@
# 2021-12-22 # 2021-12-22
- [[yoga]]
- [[push]] [[yoga for social anxiety]]
- [[2021-12-21]]
- has at least one funny bit
- also the IMHO dangerous bit with downward fold + hands under feet
- today [[stress melt]]
- [[great]]
- [[gustavo]]
- [[viaje]]
- [[berni]]
- [[doug macleod]]
- [[come to find]]
- [[stoa sync]] - [[stoa sync]]
+2
View File
@@ -4,4 +4,6 @@
- [[pull]] [[stoa subnodes]] [[autopull stoa]] - [[pull]] [[stoa subnodes]] [[autopull stoa]]
- [[anagora]] now pulls content from the [[default stoa]] (https://doc.anagora.org) and renders it as subnodes in a node (whenever it exists). - [[anagora]] now pulls content from the [[default stoa]] (https://doc.anagora.org) and renders it as subnodes in a node (whenever it exists).
- this makes [[wikilinks]], [[go]], [[pull]], [[push]] equally well for the content you add anonymously than for that you add through your [[digital garden]]. - this makes [[wikilinks]], [[go]], [[pull]], [[push]] equally well for the content you add anonymously than for that you add through your [[digital garden]].
- [[git]] https://github.com/flancia-coop/doc.anagora.org
- [[go]]