wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
server/core
History
Florin Peter 3579ba1e41 Merge branch 'master' into files_encryption 
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
2013-05-01 09:31:26 +02:00
..
ajax port 22c8194cc8 2013-04-02 21:03:13 +02:00
css revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
doc rename to doc 2012-12-14 14:39:05 +01:00
img fix ugly giant triangles 2013-02-27 11:30:06 +01:00
js revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
l10n Merge branch 'master' into files_encryption 2013-05-01 09:31:26 +02:00
lostpassword revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
templates revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
minimizer.php adding space between) and { 2012-09-07 15:22:01 +02:00
routes.php implemented a heartbeat request which is calls the server every 15 minutes to prevent a session timeout 2013-02-26 19:34:46 +01:00
setup.php Suppress the notice from the nullbyte check 2013-04-09 21:11:44 +02:00
strings.php remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00