Merge branch 'master' into 'add-rake-tasks'
# Conflicts: # Makefile
This commit is contained in:
commit
755cb72210
149 changed files with 1298 additions and 420 deletions
2
Makefile
2
Makefile
|
@ -1,5 +1,5 @@
|
|||
# Identify tasks which do not have output files:
|
||||
.PHONY: help synclivetotest
|
||||
.PHONY: help synclivetotest syncdb syncfiles
|
||||
|
||||
GREEN := $(shell tput -Txterm setaf 2)
|
||||
WHITE := $(shell tput -Txterm setaf 7)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue