Thomas Müller 32b29c9d73 Merge branch 'master' into fix-7307 ... Conflicts: core/js/router.js settings/js/admin.js		2014-03-06 00:15:08 +01:00
..
admin	Add button to send a test mail after changing the email settings	2014-03-05 10:01:34 +01:00
ajax	close encryption session after decryption was finished	2014-02-26 17:18:38 +01:00
changepassword	fixing syntax error - it it that hard to test own code?	2013-09-18 23:46:58 +02:00
css	Merge pull request #7174 from owncloud/issue/7166	2014-02-26 14:41:07 +01:00
img	remove unused log icon	2014-01-15 15:48:42 +01:00
js	Merge branch 'master' into fix-7307	2014-03-06 00:15:08 +01:00
l10n	remove ru_RU - it has bee removed from transifex	2014-01-13 16:41:10 +01:00
templates	Merge pull request #7412 from owncloud/issue/7175	2014-03-05 13:18:41 +01:00
admin.php	Add option to change email settings in admin section	2014-02-18 14:26:03 +01:00
apps.php	finally fix the app sorting	2013-10-14 10:54:38 +02:00
help.php	fix difference between packaged version and master	2013-08-17 10:33:11 +02:00
languageCodes.php	remove ru_RU - fixes #3135	2013-08-17 11:43:37 +02:00
personal.php	Indicate password strength using strengthify	2014-01-15 11:10:12 +01:00
routes.php	Merge branch 'master' into fix-7307	2014-03-06 00:15:08 +01:00
settings.php	Enhanced auth is totally unmaintained and broken	2013-01-14 21:39:49 +01:00
users.php	Pass view in \OC_Avatar to constructor and use $_ for enable_avatars	2013-09-09 16:57:46 +02:00