kondou f1518a54df Merge branch 'master' into clean_up_util ... Conflicts: lib/util.php		2013-08-20 17:20:30 +02:00
..
ajax	Merge pull request #4271 from owncloud/plural_translations	2013-08-08 10:34:28 -07:00
css	Merge pull request #4497 from owncloud/newlines_at_eof_kondou	2013-08-18 07:16:15 -07:00
doc	fix difference between packaged version and master	2013-08-17 10:33:11 +02:00
img	use proper password icon, three dots are 'more'	2013-08-16 17:59:48 +02:00
js	Merge pull request #4497 from owncloud/newlines_at_eof_kondou	2013-08-18 07:16:15 -07:00
l10n	[tx-robot] updated from transifex	2013-08-19 15:14:38 -04:00
lostpassword	Merge branch 'master' into clean_up_util	2013-08-20 17:20:30 +02:00
templates	adding file templates for ods, odt and odp	2013-08-18 21:11:11 +02:00
minimizer.php	Clean up \OC\Util	2013-08-15 15:57:32 +02:00
routes.php	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02:00
setup.php	Fix some naming and spacing in lib/util.php	2013-08-18 10:33:09 +02:00
strings.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00