Commit Graph

110 Commits

Author SHA1 Message Date
Zoz
d1f7228d28 Merge branch 'master' into Zoz 2021-02-26 18:00:00 +01:00
Zoz
63c48e160a Mise à jour de 'docker-compose/bitwarden/docker-compose.yml' 2021-02-26 17:59:03 +01:00
Zoz
16d7d7c9c3 Merge pull request 'ajout wiki casa papel' (#16) from NightPumpkin into master
Reviewed-on: #16
2021-02-26 17:52:23 +01:00
Zoz
ffe30ba7cf Mise à jour de 'docker-compose/watchtower/docker-compose.yml' 2021-02-26 17:50:27 +01:00
Zoz
3ee712f0a2 Mise à jour de 'docker-compose/tautulli/docker-compose.yml' 2021-02-26 17:49:21 +01:00
Zoz
8582be6dd8 Mise à jour de 'docker-compose/speedtest/docker-compose.yml' 2021-02-26 17:48:14 +01:00
Zoz
2f3dd88701 Mise à jour de 'docker-compose/plex/docker-compose.yml' 2021-02-26 17:47:07 +01:00
Zoz
6c2a00021e Mise à jour de 'docker-compose/heimdall/docker-compose.yml' 2021-02-26 17:45:51 +01:00
Zoz
9a1ed1d991 Mise à jour de 'docker-compose/bitwarden/docker-compose.yml' 2021-02-26 17:45:27 +01:00
Zoz
538e8505a0 Mise à jour de 'docker-compose/ombi/docker-compose.yml' 2021-02-26 17:44:50 +01:00
Zoz
5589fbb3ed Mise à jour de 'docker-compose/heimdall/docker-compose.yml' 2021-02-26 17:43:25 +01:00
Zoz
0b5c320593 Mise à jour de 'docker-compose/bitwarden/docker-compose.yml' 2021-02-26 17:42:12 +01:00
Zoz
ec44239e73 Mise à jour de 'docker-compose/adguard/docker-compose.yml' 2021-02-26 17:39:31 +01:00
101e65f417 ajout wiki casa papel 2021-02-26 17:29:32 +01:00
Zoz
a1d277435d Merge pull request 'modif wiki passmark' (#15) from NightPumpkin into master
Reviewed-on: #15
2021-02-26 17:21:59 +01:00
Zoz
2593cdc789 Mise à jour de 'wiki/passmark.md' 2021-02-26 17:21:10 +01:00
Zoz
511558bb6e Mise à jour de 'wiki/passmark.md'
Rajout de l adresse de passmark
2021-02-26 17:12:58 +01:00
e290343368 modif wiki passmark 2021-02-26 17:05:14 +01:00
NightPumpkin
d8ceac438e Merge pull request 'ajout adguard, bitwarden, heimdall, ombi,speedtest' (#14) from Zoz into master
Reviewed-on: #14
2021-02-26 16:39:55 +01:00
Zoz
23fdb58f42 ajout adguard, bitwarden, heimdall, ombi,speedtest 2021-02-26 15:39:32 +01:00
NightPumpkin
14aa229182 Merge pull request 'mise a jour de fichiers' (#13) from Zoz into master
Reviewed-on: #13
2021-02-26 15:00:04 +01:00
Zoz
5938dbf26b mise a jour de fichiers 2021-02-26 14:56:26 +01:00
Zoz
399548cabb mise a jour de fichiers 2021-02-26 14:33:11 +01:00
Zoz
528c0546a1 Merge pull request 'ajout compose openvpn-rutorrent-...' (#12) from NightPumpkin into master
Reviewed-on: #12
2021-02-26 14:29:01 +01:00
ad887f5342 ajout compose openvpn-rutorrent-... 2021-02-26 13:55:43 +01:00
NightPumpkin
b64d94552a Merge pull request 'mise a jour de fichiers' (#11) from Zoz into master
Reviewed-on: #11
2021-02-26 13:40:09 +01:00
Zoz
e7ebb4dc05 mise a jour de fichiers 2021-02-26 13:39:04 +01:00
Zoz
d05e8e34f0 mise a jour de fichiers 2021-02-26 13:36:27 +01:00
Zoz
dc7b09ad57 mise a jour de fichiers 2021-02-26 13:31:36 +01:00
Zoz
23a58c28d1 mise a jour de fichiers 2021-02-26 13:14:42 +01:00
NightPumpkin
c97467b566 Merge pull request 'NightPumpkin' (#10) from NightPumpkin into master
Reviewed-on: #10
2021-02-26 09:04:35 +01:00
82ddde2df8 rajout wiki skip intro 2021-02-26 09:01:48 +01:00
f6db0d5dc8 Merge branch 'master' into NightPumpkin 2021-02-26 08:54:17 +01:00
NightPumpkin
ba8d834e6c Merge pull request 'mise a jour des dossiers' (#9) from Zoz into master
Reviewed-on: #9
2021-02-26 08:47:27 +01:00
Zoz
5406390eea mise a jour des dossiers 2021-02-26 01:05:26 +01:00
Zoz
57fd3dd99d Merge pull request 'git nouveaux ajouts' (#7) from Benj into master
Reviewed-on: #7
2021-02-26 00:49:56 +01:00
Benj
dd554ae1bf Merge branch 'master' into Benj 2021-02-26 00:40:06 +01:00
ben
ae974da1f7 git nouveaux ajouts 2021-02-26 00:32:58 +01:00
Zoz
2b8ffe1438 Merge pull request 'plus d'info sur git' (#5) from Benj into master
Reviewed-on: #5
2021-02-26 00:30:09 +01:00
ben
c3a46eba09 plus d'info sur git 2021-02-26 00:19:55 +01:00
6e4fbfbc8f le magnifique 2021-02-26 00:08:31 +01:00
566cc553cd Merge branch 'master' of https://gitea.zoz-serv.org/Zoz/plex_fr_discord_repo 2021-02-25 23:39:50 +01:00
9586558ea3 prout 2021-02-25 23:38:59 +01:00
Zoz
9434a2977b Merge pull request 'suggestion d'organisation' (#3) from Benj into master
Reviewed-on: #3
2021-02-25 23:36:48 +01:00
ben
80e3b78ee4 Merge branch 'master' into Benj 2021-02-25 23:34:21 +01:00
ben
273c5731c8 conflit : répertoire renommé 2021-02-25 23:32:38 +01:00
ben
79ca0aa850 suggestion d'organisation 2021-02-25 23:32:38 +01:00
ben
bd382946a6 suggestion d'organisation 2021-02-25 22:57:19 +01:00
NightPumpkin
cef7b1f0c3 Merge pull request 'Transférer les fichiers vers 'Exemples docker-compose/plex_et_tautulli'' (#2) from nightpumpkin-plex_et_tautulli into master
Reviewed-on: #2
2021-02-25 22:56:10 +01:00
NightPumpkin
7d15e35f87 Transférer les fichiers vers 'Exemples docker-compose/plex_et_tautulli' 2021-02-25 22:55:15 +01:00