merge staging

2018-06-28 13:33:54 +02:00
parent 01614c4256 76c9b01d45
commit 7aa7b82c60
19 changed files with 149 additions and 57 deletions
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -51,7 +51,6 @@ define([
            'cp-settings-thumbnails',
            'cp-settings-userfeedback',
            'cp-settings-change-password',
-            //'cp-settings-migrate',
            'cp-settings-delete'
        ],
        'creation': [