server/apps
Bart Visscher 0120f3fd62 Merge branch 'routing'
Conflicts:
	core/lostpassword/index.php
	core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
..
files Merge branch 'routing' 2012-10-27 11:58:02 +02:00
files_encryption NoSpaceAfterComma II 2012-10-23 23:01:10 +02:00
files_external [tx-robot] updated from transifex 2012-10-27 00:02:05 +02:00
files_sharing [tx-robot] updated from transifex 2012-10-27 00:02:05 +02:00
files_versions Checkstyle: NoSpaceAfterComma 2012-10-23 22:53:54 +02:00
user_ldap [tx-robot] updated from transifex 2012-10-27 00:02:05 +02:00
user_webdavauth Codestyle: FunctionCallArgumentSpacing 2012-10-23 08:35:54 +02:00