Thomas Müller 3587c88fe9 Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-master ... Conflicts: apps/files/js/file-upload.js		2014-04-07 22:28:16 +02:00
..
l10n	[tx-robot] updated from transifex	2014-04-07 01:56:11 -04:00
private	Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-master	2014-04-07 22:28:16 +02:00
public	Merge pull request #8017 from Raydiation/master	2014-04-07 10:19:18 +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