resolve conflict
Description
Description
Details
Details
- Committed
hgpulse Jun 16 2021, 08:44 - Pushed
hgpulse Jun 16 2021, 08:45 - Parents
- rOACCT2f3966eae87f: rename organization table and change cost_factor type relation
rOACCTb3c641aea147: minor improvements to admin view - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| b3c641aea147 | borel | minor improvements to admin view | Jun 14 2021 | |||
| cc0814bf3332 | borel | tabulated admin pages for various models | Jun 11 2021 | |||
| 1f06019c7685 | borel | flake8-approved spacing between classes | Jun 11 2021 |