Merge pull request #666 from ArthurHoaro/slim-api

author Arthur <arthur@hoa.ro>

Tue, 20 Dec 2016 10:30:05 +0000 (11:30 +0100)

committer GitHub <noreply@github.com>

Tue, 20 Dec 2016 10:30:05 +0000 (11:30 +0100)
author Arthur <arthur@hoa.ro>
Tue, 20 Dec 2016 10:30:05 +0000 (11:30 +0100)
committer GitHub <noreply@github.com>
Tue, 20 Dec 2016 10:30:05 +0000 (11:30 +0100)
diff --cc .travis.yml
Simple merge
diff --cc index.php
Simple merge
author	Arthur <arthur@hoa.ro>
	Tue, 20 Dec 2016 10:30:05 +0000 (11:30 +0100)
committer	GitHub <noreply@github.com>
	Tue, 20 Dec 2016 10:30:05 +0000 (11:30 +0100)
		1	2
.travis.yml	patch \|	diff1 \|	diff2 \|	blob \| history
index.php	patch \|	diff1 \|	diff2 \|	blob \| history