Georg Ehrke 0fe8f77c17 Merge branch 'master' into update_shipped_apps_from_appstore ... Conflicts: lib/private/app.php settings/templates/apps.php		2014-06-05 22:54:27 +02:00
..
l10n	[tx-robot] updated from transifex	2014-06-05 01:57:20 -04:00
private	Merge branch 'master' into update_shipped_apps_from_appstore	2014-06-05 22:54:27 +02:00
public	remove file locking - code will continue to live in it's own app	2014-06-04 20:11:54 +02:00
autoloader.php	update autoloader	2014-06-04 11:34:09 +02:00
base.php	Merge pull request #8620 from owncloud/design-navigation-two	2014-06-05 10:53:22 +02:00