Homec4science
Diffusion Genome Privacy - SHCS App 49431b72b57f

Merge branch 'develop' of https://git.epfl.ch/repo/genomeprivacy into develop
49431b72b57f
Actions

Authored by Franck Youssef <franck.youssef@epfl.ch> on May 8 2014, 19:00.

Description

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

Conflicts:
project/PPPCertifiedInstitution/.classpath
project/PPPClient/.classpath
project/PPPServer/.classpath
project/PPPServer/config/config_server.fry.properties

Details

Committed
Franck Youssef <franck.youssef@epfl.ch>May 8 2014, 19:00
Pushed
raisaroApr 20 2017, 12:42
Parents
R3229:a2a28bf9db58: Merge branch 'db_connect' into develop
R3229:16ef9373960c: debriefing meeting SHCS with Mr. Yannick Vallet. Added DTDs for WebServices
Branches
Unknown
Tags
Unknown

Event Timeline

Franck Youssef <franck.youssef@epfl.ch> committed R3229:49431b72b57f: Merge branch 'develop' of https://git.epfl.ch/repo/genomeprivacy into develop (authored by Franck Youssef <franck.youssef@epfl.ch>).May 8 2014, 19:00

Merged Changes

CommitAuthorDetailsCommitted
a2a28bf9db58Franck Youssef
Merge branch 'db_connect' into develop 
May 3 2014
1013bfc7d36bFranck Youssef
config changes 
May 3 2014
daf487fbbf78Franck Youssef
config modifications at server 
May 3 2014

Empty Commit

This commit is empty and does not affect any paths.
c4science · Help