Merge branch 'master' into feature-template-list
Conflicts: circle/dashboard/views.py
Showing
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
circle/manager/moncelery.py
0 → 100755
circle/manager/slowcelery.py
0 → 100755
miscellaneous/manager.conf
0 → 100644
miscellaneous/moncelery.conf
0 → 100644
miscellaneous/slowcelery.conf
0 → 100644
Please
register
or
sign in
to comment