Giulio Cesare Solaroli 75d5724c8a Merge remote-tracking branch 'clipperz/export' into import ...

Conflicts:
	frontend/delta/css/clipperz.css
	frontend/delta/js/Clipperz/PM/DataModel/Record.js
	frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/DeleteAccount.js
	frontend/delta/js/Clipperz/PM/UI/Components/Panels/ExtraFeaturesPanel.js
	frontend/delta/js/Clipperz/PM/UI/MainController.js
	frontend/delta/properties/delta.properties.json
	frontend/delta/scss/style/settingsPanel.scss

2015-06-27 18:33:01 +02:00

..

beta

Added app version to offline copy url path

2015-03-10 22:48:56 +01:00

delta

Merge remote-tracking branch 'clipperz/export' into import

2015-06-27 18:33:01 +02:00

gamma

Added app version to offline copy url path

2015-03-10 22:48:56 +01:00