Conflicts: data/database.py endpoints/api.py endpoints/common.py templates/base.html test/data/test.db test/specs.py |
||
|---|---|---|
| .. | ||
| 500.html | ||
| base.html | ||
| confirmerror.html | ||
| disclaimer.html | ||
| githuberror.html | ||
| index.html | ||
| oauthorize.html | ||
| privacy.html | ||
| tos.html | ||
Conflicts: data/database.py endpoints/api.py endpoints/common.py templates/base.html test/data/test.db test/specs.py |
||
|---|---|---|
| .. | ||
| 500.html | ||
| base.html | ||
| confirmerror.html | ||
| disclaimer.html | ||
| githuberror.html | ||
| index.html | ||
| oauthorize.html | ||
| privacy.html | ||
| tos.html | ||