merge conflicts ...
Showing
- .gitignore 21 additions, 18 deletions.gitignore
- 3rdparty 1 addition, 1 deletion3rdparty
- apps/files/ajax/scan.php 29 additions, 13 deletionsapps/files/ajax/scan.php
- apps/files/ajax/upload.php 55 additions, 15 deletionsapps/files/ajax/upload.php
- apps/files/css/files.css 8 additions, 0 deletionsapps/files/css/files.css
- apps/files/index.php 3 additions, 1 deletionapps/files/index.php
- apps/files/js/file-upload.js 343 additions, 0 deletionsapps/files/js/file-upload.js
- apps/files/js/fileactions.js 5 additions, 1 deletionapps/files/js/fileactions.js
- apps/files/js/filelist.js 56 additions, 9 deletionsapps/files/js/filelist.js
- apps/files/js/files.js 17 additions, 150 deletionsapps/files/js/files.js
- apps/files/l10n/ar.php 5 additions, 6 deletionsapps/files/l10n/ar.php
- apps/files/l10n/bg_BG.php 4 additions, 3 deletionsapps/files/l10n/bg_BG.php
- apps/files/l10n/bn_BD.php 6 additions, 7 deletionsapps/files/l10n/bn_BD.php
- apps/files/l10n/ca.php 14 additions, 8 deletionsapps/files/l10n/ca.php
- apps/files/l10n/cs_CZ.php 11 additions, 8 deletionsapps/files/l10n/cs_CZ.php
- apps/files/l10n/cy_GB.php 6 additions, 7 deletionsapps/files/l10n/cy_GB.php
- apps/files/l10n/da.php 9 additions, 8 deletionsapps/files/l10n/da.php
- apps/files/l10n/de.php 9 additions, 8 deletionsapps/files/l10n/de.php
- apps/files/l10n/de_DE.php 14 additions, 8 deletionsapps/files/l10n/de_DE.php
- apps/files/l10n/el.php 11 additions, 8 deletionsapps/files/l10n/el.php
Loading
Please register or sign in to comment