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
..
beta	Added app version to offline copy url path	2015-03-10 22:48:56 +01:00
delta	Merge branch 'import'	2015-06-27 18:38:06 +02:00
gamma	Added app version to offline copy url path	2015-03-10 22:48:56 +01:00