• Alain Takoudjou's avatar
    Merge branch 'slaprunner-paas' into slaprunner-layout · becd5186
    Alain Takoudjou authored
    Conflicts:
    	slapos/runner/static/css/styles.css
    	slapos/runner/static/js/scripts/process.js
    	slapos/runner/static/js/scripts/softwareFolder.js
    	slapos/runner/static/js/scripts/viewlog.js
    	slapos/runner/templates/account.html
    	slapos/runner/templates/layout.html
    	slapos/runner/templates/softwareFolder.html
    	slapos/runner/templates/viewLog.html
    	slapos/runner/views.py
    becd5186
softwareFolder.js 30.6 KB