Giulio Cesare Solaroli 83b40aea50 Merge branch 'import' ... Conflicts: frontend/delta/css/clipperz.css frontend/delta/css/clipperz.css.map frontend/delta/scss/core/layout.scss frontend/delta/scss/core/mixin.scss		2015-06-27 18:38:06 +02:00
..
core	Merge branch 'import'	2015-06-27 18:38:06 +02:00
style	Merge branch 'import'	2015-06-27 18:38:06 +02:00
clipperz.scss	Added copyright/license notice to SCSS files	2015-03-22 23:15:45 +01:00