Merge branch 'develop' of https://github.com/Gundars/heartbeat into d… · Gundars/heartbeat@8d2b90a · GitHub

Commit

Merge branch 'develop' of https://github.com/Gundars/heartbeat into d…

Browse files

…evelop

Conflicts:
	Heartbeat.php
	README.md
	load.php

Loading branch information

Gundars committed Nov 12, 2016

2 parents 46e0bce + 09152ec commit 8d2b90a