paulin/bonobo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '0.3' into develop

Browse Source 
Conflicts:
	Makefile
	requirements-dev.txt
This commit is contained in:
Romain Dorgueil
2017-06-10 14:17:26 +02:00
parent 2b584935c5 e0a00dcc91
commit 187a24fca9
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,7 +1,7 @@
# This file has been auto-generated.
# All changes will be lost, see Projectfile.
#
# Updated at 2017-06-10 13:33:51.811144
# Updated at 2017-06-10 14:17:07.161053
PACKAGE ?= bonobo
PYTHON ?= $(shell which python)