Giulio Cesare Solaroli 9d9dd1e161 Merge remote-tracking branch 'gcsolaroli/master' ... Conflicts: frontend/delta/css/clipperz.css.map		2015-08-20 11:22:41 +02:00
..
clipperz.css	Merge remote-tracking branch 'gcsolaroli/master'	2015-08-20 11:22:41 +02:00
clipperz.css.map	Integrated Giulio's comments in previous commit	2015-08-20 11:13:24 +02:00