Merge branches api-current and ui-0.4, minor fixes
Merge branches api-current and ui-0.4: * Fix merge conflicts * Fix minor bug in reconciliation mgmt command * Add comments in settings.py.dist * minor PEP8 fixes
View revisions
Also available in: Atom