Signed-off-by: Thibaud Arnault <thyb@webshell-dev.(none)>
Merge branch 'master' of github.com:webshell/APIs

Conflicts:
	github/v0.1/github