Homec4science

Merge branch 'master' of https://c4science.ch/diffusion/988/ijp-frc.git

Authored by oburri on Sep 15 2016, 10:35.

Description

Merge branch 'master' of https://c4science.ch/diffusion/988/ijp-frc.git

Conflicts:
README.md

Details

Committed
oburriSep 15 2016, 10:35
Pushed
oburriSep 15 2016, 10:35
Parents
R988:79d9ad8df970: More changes to License
R988:ee36c74b2c2e: More changes to License
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
ee36c74b2c2eoburri
More changes to License 
Sep 15 2016