Merge pull request #727 from ArthurHoaro/api/getlinks

author ArthurHoaro <arthur@hoa.ro>

Sun, 15 Jan 2017 15:49:50 +0000 (16:49 +0100)

committer GitHub <noreply@github.com>

Sun, 15 Jan 2017 15:49:50 +0000 (16:49 +0100)
author ArthurHoaro <arthur@hoa.ro>
Sun, 15 Jan 2017 15:49:50 +0000 (16:49 +0100)
committer GitHub <noreply@github.com>
Sun, 15 Jan 2017 15:49:50 +0000 (16:49 +0100)
diff --cc application/api/ApiUtils.php
Simple merge
diff --cc index.php
Simple merge
diff --cc tests/api/ApiUtilsTest.php
Simple merge
author	ArthurHoaro <arthur@hoa.ro>
	Sun, 15 Jan 2017 15:49:50 +0000 (16:49 +0100)
committer	GitHub <noreply@github.com>
	Sun, 15 Jan 2017 15:49:50 +0000 (16:49 +0100)
		1	2
application/api/ApiUtils.php	patch \|	diff1 \|	diff2 \|	blob \| history
index.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/api/ApiUtilsTest.php	patch \|	diff1 \|	diff2 \|	blob \| history