Homec4science

Merge branch 'master' of https://git.epfl.ch/repo/genomeprivacy

Authored by Franck Youssef <franck.youssef@epfl.ch> on Mar 31 2014, 20:09.

Description

Merge branch 'master' of https://git.epfl.ch/repo/genomeprivacy

Conflicts:
.gitignore

Event Timeline

Franck Youssef <franck.youssef@epfl.ch> committed R3229:be7e7b82f24c: Merge branch 'master' of https://git.epfl.ch/repo/genomeprivacy (authored by Franck Youssef <franck.youssef@epfl.ch>).Mar 31 2014, 20:09

Merged Changes

CommitAuthorDetailsCommitted
171f8db87fa6Franck Youssef
Merge branch 'master' of https://git.epfl.ch/repo/genomeprivacy 
Mar 31 2014
3456fb4df63aFranck Youssef
MINOR: added gitignore conflicting 
Mar 31 2014