merging devel

This commit is contained in:
Wayne Witzel III
2016-10-03 10:35:50 -04:00
110 changed files with 5192 additions and 2396 deletions

View File

@@ -1,6 +1,5 @@
runserver: make runserver
celeryd: make celeryd
taskmanager: make taskmanager
receiver: make receiver
factcacher: make factcacher
flower: make flower
flower: make flower