Björn Schießle 7cfb0dc406 Merge branch 'master' into files_encryption_check_private_key ... Conflicts: apps/files_encryption/appinfo/app.php apps/files_encryption/lib/util.php		2013-06-13 13:17:35 +02:00
..
ajax	Merge branch 'master' into files_encryption_check_private_key	2013-06-13 13:17:35 +02:00
css	remove App management top bar and move buttons more contextually in the interface	2013-06-12 13:36:17 +02:00
img	Optimize svgs with scour.	2013-04-12 19:06:29 +02:00
js	show nicer warning if the admin recovery password was wrong	2013-05-16 16:01:40 +02:00
l10n	[tx-robot] updated from transifex	2013-06-13 02:20:23 +02:00
templates	Merge pull request #3677 from owncloud/apps-buttons	2013-06-13 01:44:48 -07:00
admin.php	fix method naming	2013-05-31 23:24:09 +02:00
apps.php
help.php
languageCodes.php	Modify zh_* language codes	2013-05-04 20:27:40 +08:00
personal.php	Fix #3251	2013-05-09 23:19:37 +02:00
routes.php
settings.php
users.php	allow admin to recover users files in case of password lost	2013-05-16 14:53:04 +02:00