Thomas Müller d2961dcf11 Merge branch 'master' into lukepolo-master ... Conflicts: apps/files/js/filelist.js		2014-04-09 22:00:25 +02:00
..
l10n	[tx-robot] updated from transifex	2014-04-09 01:56:49 -04:00
private	Merge branch 'master' into lukepolo-master	2014-04-09 22:00:25 +02:00
public	Merge pull request #7643 from owncloud/chainable_response	2014-04-08 22:42:43 +02:00
autoloader.php
base.php	reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085	2014-04-07 14:04:16 +02:00