Merge branch 'master' into master
d6a4478caf10
Actions

Authored by bryanzim <BryanZim@bazinnovations.com> on Dec 8 2017, 19:11.

Description

Merge branch 'master' into master

Committed

GitHub <noreply@github.com>

Dec 8 2017, 19:11

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:d6a4478caf10: Merge branch 'master' into master (authored by bryanzim <BryanZim@bazinnovations.com>).Dec 8 2017, 19:11

	Commit			Author	Details	Committed
	cc372a071bb4			Gennadiy Civil/GitHub	Merge pull request #1340 from coryan/fix-googlemock-test-build-file	Dec 8 2017
	cf3adad594b6			Carlos O'Ryan/Carlos O'Ryan	Add licenses() directive for googlemock/tests.	Dec 8 2017

				Path
	M			googlemock/test/BUILD.bazel