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
..
admin	Merge branch 'master' into type-hinting	2014-03-31 21:38:54 +02:00
ajax	Merge branch 'master' into update_shipped_apps_from_appstore	2014-06-05 22:54:27 +02:00
changepassword	remove legacy aka deprecated code: OC_FilesystemView	2014-05-12 16:30:39 +02:00
css	Merge pull request #8620 from owncloud/design-navigation-two	2014-06-05 10:53:22 +02:00
img	remove unused log icon	2014-01-15 15:48:42 +01:00
js	Merge branch 'master' into update_shipped_apps_from_appstore	2014-06-05 22:54:27 +02:00
l10n	[tx-robot] updated from transifex	2014-06-05 01:57:20 -04:00
templates	Merge branch 'master' into update_shipped_apps_from_appstore	2014-06-05 22:54:27 +02:00
admin.php	Merge pull request #8840 from owncloud/share_settings	2014-06-03 16:42:44 +02:00
apps.php	Add option to enable app for specific groups	2014-06-03 12:42:35 +02:00
help.php	killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest()	2014-03-25 17:42:41 +01:00
languageCodes.php	remove ru_RU - fixes #3135	2013-08-17 11:43:37 +02:00
personal.php	backup the encryption key after the encryption was disabled so that the user	2014-05-13 12:35:25 +02:00
routes.php	Merge branch 'master' into update_shipped_apps_from_appstore	2014-06-05 22:54:27 +02:00
settings.php	killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest()	2014-03-25 17:42:41 +01:00
users.php	small fixes / cleanup	2014-06-02 12:53:57 +02:00