diff options
| author | Alex <alex@adnab.me> | 2021-04-30 15:47:11 +0200 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2021-04-30 15:47:11 +0200 |
| commit | b1f60579a13d3c5eba7f74b1775c84639ea9b51a (patch) | |
| tree | 2581343ea7a97118064191ce06639e72d37bfa20 /doc/book | |
| parent | dcfc32cf85bc6276fdff2492898c1cbb527e9b9d (diff) | |
| parent | be3b1d8f91b7e9a42dee9083ee0e9ebf52bbc57f (diff) | |
| download | garage-b1f60579a13d3c5eba7f74b1775c84639ea9b51a.tar.gz garage-b1f60579a13d3c5eba7f74b1775c84639ea9b51a.zip | |
Merge pull request 'created doc/talks subfolder and added my talk and the previous one done at the wide team' (#67) from talks into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/67
Diffstat (limited to 'doc/book')
| -rw-r--r-- | doc/book/src/intro.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/book/src/intro.md b/doc/book/src/intro.md index 3440aef3..352f1be1 100644 --- a/doc/book/src/intro.md +++ b/doc/book/src/intro.md @@ -89,7 +89,9 @@ If you encounter a specific bug in Garage or plan to patch it, you may jump dire We love to talk and hear about Garage, that's why we keep a log here: - - [(fr, 2020-12-02) Garage : jouer dans la cour des grands quand on est un hébergeur associatif](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/branch/main/doc/20201202_talk/talk.pdf) + - [(en, 2021-04-28) Distributed object storage is centralised](https://git.deuxfleurs.fr/Deuxfleurs/garage/raw/branch/talks/doc/main/2021-04-28_spirals-team/talk.pdf) + + - [(fr, 2020-12-02) Garage : jouer dans la cour des grands quand on est un hébergeur associatif](https://git.deuxfleurs.fr/Deuxfleurs/garage/raw/branch/main/doc/talks/2020-12-02_wide-team/talk.pdf) *Did you write or talk about Garage? [Open a pull request](https://git.deuxfleurs.fr/Deuxfleurs/garage/) to add a link here!* |