Thomas Müller f950ce82ae Merge branch 'master' into mobile-style ... Conflicts: apps/files/js/files.js apps/files_sharing/css/public.css apps/files_sharing/js/public.js apps/files_sharing/templates/public.php		2014-01-23 00:39:11 +01:00
..
ajax	check if user is logged in	2013-11-26 12:47:59 +01:00
changepassword
css	added website field	2014-01-17 16:35:48 +01:00
img	remove unused log icon	2014-01-15 15:48:42 +01:00
js	added website field	2014-01-17 16:35:48 +01:00
l10n	remove ru_RU - it has bee removed from transifex	2014-01-13 16:41:10 +01:00
templates	added website field	2014-01-17 16:35:48 +01:00
admin.php	lower required php version to 5.3.3	2013-12-04 10:25:22 +01:00
apps.php	finally fix the app sorting	2013-10-14 10:54:38 +02:00
help.php
languageCodes.php
personal.php	Indicate password strength using strengthify	2014-01-15 11:10:12 +01:00
routes.php
settings.php
users.php