Homec4science

Merge branch 'master' into master

Authored by bryanzim <BryanZim@bazinnovations.com> on Dec 15 2017, 22:52.

Description

Merge branch 'master' into master

Event Timeline

GitHub <noreply@github.com> committed R9484:8cbda54f48bd: Merge branch 'master' into master (authored by bryanzim <BryanZim@bazinnovations.com>).Dec 15 2017, 22:52

Merged Changes

CommitAuthorDetailsCommitted
1865ecaf1779Gennadiy Civil/GitHub
Merge pull request #1354 from coryan/fix-top-level-license 
Dec 15 2017
f34cbefe5098Carlos O'Ryan
Merge branch 'fix-top-level-license' of github.com:coryan/googletest into fix… 
Dec 12 2017
23a014ab5786Carlos O'Ryan
Refactor docs about contributions to CONTRIBUTING.md. 
Dec 12 2017
cb95f316c8f5Gennadiy Civil/GitHub
Merge branch 'master' into fix-top-level-license 
Dec 11 2017
c82cd5e41e37Carlos O'Ryan
Also add documentation around becoming a contributor. 
Dec 9 2017
11841175d802Carlos O'Ryan
Wrong LICENSE file, sorry. Corrected. [skip ci] 
Dec 9 2017
e22d344c51b4Carlos O'Ryan
Add Apache-2.0 LICENSE file. 
Dec 8 2017