Merge branch 'master' of https://gitlab.epfl.ch/sti-it/git-demo
Description
Description
Details
Details
- Committed
pierre.amey@epfl.ch <pierrot@tsf-476-wpa-4-077.epfl.ch> Oct 2 2015, 10:53 - Pushed
nborboen Dec 20 2016, 13:24 - Parents
- rGITDEMO665d2c13a887: Creation d'un conflit
rGITDEMO809a0ab00b25: modif très importante! - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
809a0ab00b25 | sbancal | modif très importante! | Oct 2 2015 | |||
7b5d23d91b24 | ndubois | Merge branch 'master' of https://gitlab.epfl.ch/sti-it/git-demo | Oct 2 2015 | |||
019a87856cb4 | ndubois | Merge branch 'master' of https://gitlab.epfl.ch/sti-it/git-demo | Oct 2 2015 | |||
01f26bfa720b | ndubois | Merge branch 'master' of https://gitlab.epfl.ch/sti-it/git-demo | Oct 2 2015 | |||
15aa95a63b7f | ndubois | Merge branch 'master' of https://gitlab.epfl.ch/sti-it/git-demo | Oct 2 2015 | |||
55e3325380ec | ndubois | Commentaire super utile | Oct 2 2015 | |||
da1d8a02c3a8 | humbert | Merge branch 'master' of https://gitlab.epfl.ch/sti-it/git-demo | Oct 2 2015 | |||
4ba516c47b02 | humbert | Merge branch 'master' of https://gitlab.epfl.ch/sti-it/git-demo | Oct 2 2015 | |||
bf50d9a29700 | humbert | Merge branch 'master' of https://gitlab.epfl.ch/sti-it/git-demo | Oct 2 2015 | |||
fe9452ad564b | humbert | test | Oct 2 2015 |