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
..
css	Merge remote-tracking branch 'clipperz/export' into import	2015-06-27 18:33:01 +02:00
fonts	Merged Import and Export branches, implemented Giulio's remarks on Import feature	2015-05-21 14:34:49 +02:00
html	Merged Import and Export branches, implemented Giulio's remarks on Import feature	2015-05-21 14:34:49 +02:00
js	Merge remote-tracking branch 'clipperz/export' into import	2015-06-27 18:33:01 +02:00
properties	Merge remote-tracking branch 'clipperz/export' into import	2015-06-27 18:33:01 +02:00
scss	Merge branch 'import'	2015-06-27 18:38:06 +02:00
tests	Enabled one more (now green) test	2015-03-16 17:44:32 +01:00