prieto b79feb2ddf Resolves conflicts with last merge | 8 years ago | |
---|---|---|
.. | ||
admin | 8 years ago | |
components | 8 years ago | |
css | 8 years ago | |
documents | 8 years ago | |
errors | 8 years ago | |
index | 8 years ago | |
listing | 8 years ago | |
macros | 8 years ago | |
users | 8 years ago | |
base.html | 8 years ago | |
base_backend.html | 8 years ago | |
error.html | 8 years ago | |
errors.html | 8 years ago | |
test.html | 8 years ago |