Thomas Müller 221a650815 Merge branch 'master' into activities-api ... Conflicts: lib/private/server.php		2013-10-16 21:15:25 +02:00
..
l10n	[tx-robot] updated from transifex	2013-10-13 20:33:30 -04:00
private	Merge branch 'master' into activities-api	2013-10-16 21:15:25 +02:00
public	Merge branch 'master' into activities-api	2013-10-16 21:15:25 +02:00
autoloader.php	Merge pull request #5071 from owncloud/fix-autoloader-master	2013-10-02 03:10:10 -07:00
base.php	Merge branch 'master' into fixing-appframework-master	2013-10-16 15:45:55 +02:00