Conflicts: endpoints/index.py static/css/quay.css static/js/app.js static/js/controllers.js test/data/test.db |
||
|---|---|---|
| .. | ||
| base.html | ||
| confirmerror.html | ||
| disclaimer.html | ||
| githuberror.html | ||
| index.html | ||
| privacy.html | ||
| tos.html | ||
Conflicts: endpoints/index.py static/css/quay.css static/js/app.js static/js/controllers.js test/data/test.db |
||
|---|---|---|
| .. | ||
| base.html | ||
| confirmerror.html | ||
| disclaimer.html | ||
| githuberror.html | ||
| index.html | ||
| privacy.html | ||
| tos.html | ||