Merge branch 'master' of https://gitlab.epfl.ch/sti-it/git-demo
Description
Description
Details
Details
- Committed
nepa Oct 2 2015, 11:02 - Pushed
nborboen Dec 20 2016, 13:24 - Parents
- rGITDEMO4b19b2e169a5: Merge branch 'master' of https://gitlab.epfl.ch/sti-it/git-demo
rGITDEMO724aed2884f9: merge - Branches
- Unknown
- Tags
- References
- HEAD -> master
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 4b19b2e169a5 | ndubois | Merge branch 'master' of https://gitlab.epfl.ch/sti-it/git-demo | Oct 2 2015 | |||
| 678bbbbd1de0 | ndubois | ioiswerhjfoi | Oct 2 2015 | |||
| cb6470effacf | pierre.amey@epfl.ch | Merge branch 'master' of https://gitlab.epfl.ch/sti-it/git-demo | Oct 2 2015 | |||
| 665d2c13a887 | pierre.amey@epfl.ch | Creation d'un conflit | Oct 2 2015 | |||
| 5c9c05224ac7 | pierre.amey@epfl.ch | Merge branch 'master' of https://gitlab.epfl.ch/sti-it/git-demo | Oct 2 2015 | |||
| ca05372a32e9 | pierre.amey@epfl.ch | Merge branch 'master' of https://gitlab.epfl.ch/sti-it/git-demo | Oct 2 2015 | |||
| 9b3da80400db | pierre.amey@epfl.ch | Merge branch 'master' of https://gitlab.epfl.ch/sti-it/git-demo | Oct 2 2015 | |||
| bcd2b47e61ce | pierre.amey@epfl.ch | Commentaire: Premiere modification teste | Oct 2 2015 |