Björn Schießle 632ca9f06d Merge branch 'master' into update-expire-function ... Conflicts: apps/files_trashbin/lib/trash.php		2013-02-25 11:14:06 +01:00
..
ajax	Whitespace fixes	2013-02-22 19:05:36 +01:00
appinfo	Merge branch 'master' into update-expire-function	2013-02-25 11:14:06 +01:00
css	added revert attempt outcome messages, removed contextual ajax revert button for now as it's not functional, improved readaibility of scripts	2012-04-27 13:19:16 +01:00
js	Whitespace fixes	2013-02-22 19:05:36 +01:00
l10n	[tx-robot] updated from transifex	2013-02-22 00:08:47 +01:00
lib	Merge branch 'master' into update-expire-function	2013-02-25 11:14:06 +01:00
templates	Style cleanup files_versions	2013-02-21 23:47:21 +01:00
history.php	l10n support enhanced in files_version	2013-02-07 16:17:54 +01:00
settings.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00