Thomas Müller 1a73e607bd Merge branch 'master' into more-themable-strings ... Conflicts: lib/template.php		2013-07-24 09:35:33 +02:00
..
appinfo	Update app.php	2013-03-02 12:33:38 +01:00
l10n	[tx-robot] updated from transifex	2013-07-22 02:03:23 -04:00
templates	reword WebDAV auth to not have 'ownCloud' anymore	2013-07-11 17:42:16 +02:00
settings.php	Whitespace fixes	2013-02-22 19:05:36 +01:00
user_webdavauth.php	improve error handling of webdavauth	2013-06-21 14:39:04 +02:00