Bart Visscher b483f2aab8 Merge branch 'master' into routing ... Conflicts: apps/contacts/js/contacts.js apps/contacts/lib/search.php apps/files_archive/js/archive.js apps/gallery/lib/tiles.php apps/gallery/templates/index.php lib/ocs.php		2012-08-30 21:49:28 +02:00
..
ajax	Whitespace fixes in apps	2012-08-29 20:29:43 +02:00
appinfo	Whitespace fixes in apps	2012-08-29 20:29:43 +02:00
css	upload button improvement, better separation, fix wrap issue	2012-08-27 14:05:18 -07:00
js	Merge branch 'master' into routing	2012-08-30 21:49:28 +02:00
l10n	[tx-robot] updated from transifex	2012-08-29 02:06:48 +02:00
templates	Space before tab fixes	2012-08-29 20:34:44 +02:00
admin.php	Whitespace fixes in apps	2012-08-29 20:29:43 +02:00
download.php	Whitespace fixes in apps	2012-08-29 20:29:43 +02:00
index.php	Merge remote-tracking branch 'gitorious/master' into routing	2012-08-29 20:16:39 +02:00
settings.php	Whitespace fixes in apps	2012-08-29 20:29:43 +02:00