Homec4science

Merge branch 'master' of https://gitlab.epfl.ch/sti-it/git-demo

Authored by ndubois on Oct 2 2015, 10:55.

Description

Details

Committed
nduboisOct 2 2015, 10:55
Pushed
nborboenDec 20 2016, 13:24
Parents
rGITDEMOcb6470effacf: Merge branch 'master' of https://gitlab.epfl.ch/sti-it/git-demo
rGITDEMO678bbbbd1de0: ioiswerhjfoi
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
cb6470effacfpierre.amey@epfl.ch
Merge branch 'master' of https://gitlab.epfl.ch/sti-it/git-demo 
Oct 2 2015
665d2c13a887pierre.amey@epfl.ch
Creation d'un conflit 
Oct 2 2015
5c9c05224ac7pierre.amey@epfl.ch
Merge branch 'master' of https://gitlab.epfl.ch/sti-it/git-demo 
Oct 2 2015
ca05372a32e9pierre.amey@epfl.ch
Merge branch 'master' of https://gitlab.epfl.ch/sti-it/git-demo 
Oct 2 2015
9b3da80400dbpierre.amey@epfl.ch
Merge branch 'master' of https://gitlab.epfl.ch/sti-it/git-demo 
Oct 2 2015
bcd2b47e61cepierre.amey@epfl.ch
Commentaire: Premiere modification teste 
Oct 2 2015