views.py
3.56 KB
-
Merge branch 'feature-occi' into feature-voms-occi · aff5f70fConflicts: circle/circle/settings/base.py circle/circle/urls.py circle/occi/occi.py circle/occi/templates/occi/compute.html circle/occi/urls.py circle/occi/views.py
Kálmán Viktor committed