diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-22 13:19:12 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-22 13:19:12 +0200 |
| commit | 4c2cf35050032002d01978f53201723330ebfe16 (patch) | |
| tree | cb931972aae1381d0d46aa934fa56f462e4c873a /apps/user_migrate | |
| parent | 711aa229b882d3fc5e2fa8c22e6db2ec05642984 (diff) | |
| parent | 1bba4456420d1824ab6d58f3d9bb523fcde5c4c2 (diff) | |
| download | nextcloud-server-4c2cf35050032002d01978f53201723330ebfe16.tar.gz nextcloud-server-4c2cf35050032002d01978f53201723330ebfe16.zip | |
fix merge conflicts
Diffstat (limited to 'apps/user_migrate')
| -rw-r--r-- | apps/user_migrate/templates/admin.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/user_migrate/templates/admin.php b/apps/user_migrate/templates/admin.php index b01e5c7579a..ff51f43ffde 100644 --- a/apps/user_migrate/templates/admin.php +++ b/apps/user_migrate/templates/admin.php @@ -6,7 +6,7 @@ <?php } ?> <legend><strong><?php echo $l->t('Import user account');?></strong></legend> </p> - <p><input type="file" id="owncloud_import" name="owncloud_import"><label for="owncloud_import"><?php echo $l->t('ownCloud User Zip');?></label> + <p><input type="file" id="owncloud_import" name="owncloud_import" style="width:180px;"><label for="owncloud_import"> <?php echo $l->t('ownCloud User Zip');?></label> </p> <input type="submit" name="user_import" value="<?php echo $l->t('Import'); ?>" /> </fieldset> |