wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
server/apps/files_external
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
..
3rdparty/phpseclib Updated phpseclib from git + requested style changes 2013-02-10 12:35:49 +01:00
ajax Merge branch 'master' into external_storage_ui_feedback 2013-02-19 19:12:14 -05:00
appinfo Update app.php 2013-03-02 12:12:33 +01:00
css fixing issues with UTF8 characters in translatable strings 2013-02-13 00:23:37 +01:00
img Show status icons for mount points in external storage UI 2012-12-24 13:45:52 -05:00
js Fix Dropbox and Google ui 2013-02-25 19:45:01 -05:00
l10n Merge branch 'master' into files_encryption 2013-05-01 09:31:26 +02:00
lib External Storage: Check for curl in PHP 2013-04-23 12:36:30 +02:00
templates Files External: show display names instead of internal user names in Settings UI 2013-03-27 19:07:33 +01:00
tests Merge pull request #1030 from hkjolhede/master 2013-02-10 05:06:00 -08:00
personal.php [files_external] From echo to p 2013-02-27 21:31:27 +01:00
settings.php Files External: show display names instead of internal user names in Settings UI 2013-03-27 19:07:33 +01:00