Merge branch 'master' into ceph
Conflicts: circle/storage/models.py
Showing

6.33 KB

14.8 KB

27.7 KB

10.2 KB

29.1 KB

33.7 KB

63 KB

14.8 KB

62.6 KB

22.6 KB

6.75 KB
circle/templates/info/resize.html
0 → 100644
This diff is collapsed.
Click to expand it.
miscellaneous/portal-uwsgi.service
0 → 100644
Please
register
or
sign in
to comment