Conflicts: apps/user_ldap/l10n/nn_NO.php core/l10n/es.php core/l10n/et_EE.php core/l10n/ja_JP.php core/l10n/nn_NO.php l10n/ca/core.po l10n/ca/files_external.po l10n/ca/settings.po l10n/cy_GB/core.po l10n/cy_GB/files.po l10n/cy_GB/files_encryption.po l10n/cy_GB/files_external.po l10n/cy_GB/files_sharing.po l10n/cy_GB/files_trashbin.po l10n/cy_GB/lib.po l10n/cy_GB/settings.po l10n/de_DE/core.po l10n/es/core.po l10n/et_EE/core.po l10n/et_EE/files.po l10n/et_EE/settings.po l10n/et_EE/user_ldap.po l10n/gl/core.po l10n/it/core.po l10n/ja_JP/core.po l10n/ja_JP/settings.po l10n/nn_NO/core.po l10n/nn_NO/user_ldap.po l10n/pt_BR/core.po l10n/templates/core.pot l10n/templates/files.pot l10n/templates/files_encryption.pot l10n/templates/files_external.pot l10n/templates/files_sharing.pot l10n/templates/files_trashbin.pot l10n/templates/files_versions.pot l10n/templates/lib.pot l10n/templates/settings.pot l10n/templates/user_ldap.pot l10n/templates/user_webdavauth.pot l10n/zh_TW/files_sharing.po settings/l10n/et_EE.php |
11 years ago | |
---|---|---|
.. | ||
ajax | port 22c8194cc8fde88957dbc8c6d9e253fac3c637bb | 11 years ago |
css | revert changes to fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is very unstable right now | 11 years ago |
doc | rename to doc | 11 years ago |
img | fix ugly giant triangles | 11 years ago |
js | revert changes to fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is very unstable right now | 11 years ago |
l10n | Merge branch 'master' into files_encryption | 11 years ago |
lostpassword | revert changes to fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is very unstable right now | 11 years ago |
templates | revert changes to fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is very unstable right now | 11 years ago |
minimizer.php | adding space between) and { | 11 years ago |
routes.php | implemented a heartbeat request which is calls the server every 15 minutes to prevent a session timeout | 11 years ago |
setup.php | Suppress the notice from the nullbyte check | 11 years ago |
strings.php | remove superfluous ?> at the end of .php files (left out apps/*/templates) | 12 years ago |