Zoz pushed to Zoz at Zoz/plex_fr_discord_repo 2021-02-26 00:31:25 +01:00
0c38ccff1e Merge branch 'master' into Zoz
2b8ffe1438 Merge pull request 'plus d'info sur git' (#5) from Benj into master
c3a46eba09 plus d'info sur git
Compare 3 commits »
Zoz commented on pull request Zoz/plex_fr_discord_repo#6 2021-02-26 00:31:05 +01:00
benj est un salop

Mouarf :D Et si je ne veux pas de cette pull request, je peux la clore directement en cliquant en bas sur Clore :P

A bas le totalitarisme

Zoz merged pull request Zoz/plex_fr_discord_repo#5 2021-02-26 00:30:09 +01:00
plus d'info sur git
Zoz pushed to master at Zoz/plex_fr_discord_repo 2021-02-26 00:30:09 +01:00
2b8ffe1438 Merge pull request 'plus d'info sur git' (#5) from Benj into master
c3a46eba09 plus d'info sur git
Compare 2 commits »
Zoz created pull request Zoz/plex_fr_discord_repo#6 2021-02-26 00:27:11 +01:00
benj est un salop
Zoz pushed to Zoz at Zoz/plex_fr_discord_repo 2021-02-26 00:26:23 +01:00
122e7aaf7b benj est un salop
Zoz commented on pull request Zoz/plex_fr_discord_repo#4 2021-02-26 00:18:24 +01:00
wouhaa

Refuserrrrr!!!!!!

Zoz closed pull request Zoz/plex_fr_discord_repo#4 2021-02-26 00:18:24 +01:00
wouhaa
Zoz created branch Zoz in Zoz/plex_fr_discord_repo 2021-02-25 23:56:06 +01:00
Zoz pushed to Zoz at Zoz/plex_fr_discord_repo 2021-02-25 23:56:06 +01:00
Zoz pushed to master at Zoz/plex_fr_discord_repo 2021-02-25 23:36:49 +01:00
9434a2977b Merge pull request 'suggestion d'organisation' (#3) from Benj into master
80e3b78ee4 Merge branch 'master' into Benj
bd382946a6 suggestion d'organisation
Compare 3 commits »
Zoz merged pull request Zoz/plex_fr_discord_repo#3 2021-02-25 23:36:48 +01:00
suggestion d'organisation
Zoz commented on pull request Zoz/plex_fr_discord_repo#3 2021-02-25 23:25:26 +01:00
suggestion d'organisation

editor.merge_conflict

editor.merge_conflict_summary

CONFLICT (file location): Exemples docker-compose/plex_et_tautulli/docker-compose.yml added in HEAD inside a directory that was renamed in…

Zoz commented on pull request Zoz/plex_fr_discord_repo#3 2021-02-25 23:19:11 +01:00
suggestion d'organisation

C est trop cooll on peu commenter, le mec c est chauffer

Zoz pushed to master at Zoz/plex_fr_discord_repo 2021-02-25 21:33:17 +01:00
0a4f5c3210 modif des compose suivant charte citrouille_v1
Zoz pushed to master at Zoz/plex_fr_discord_repo 2021-02-25 21:07:25 +01:00
da461f9363 avec des sous repertoires
Zoz pushed to master at Zoz/plex_fr_discord_repo 2021-02-25 20:50:31 +01:00
6b1d0dd42b avec des sous repertoires
Zoz merged pull request Zoz/plex_fr_discord_repo#1 2021-02-25 20:05:53 +01:00
Mise à jour de 'plex/docker-compose.yml'
Zoz pushed to master at Zoz/plex_fr_discord_repo 2021-02-25 20:05:53 +01:00
62bfecd8fe Merge pull request 'Mise à jour de 'plex/docker-compose.yml'' (#1) from NightPumpkin/plex_fr_discord_repo:master into master
5fa5e03b42 Mise à jour de 'plex/docker-compose.yml'
Compare 2 commits »
Zoz pushed to master at Zoz/plex_fr_discord_repo 2021-02-25 19:44:51 +01:00
71d74cfe07 Supprimer 'docker-compose.yml'