Georg Ehrke af983b843d fix merge conflicts		2013-08-05 14:27:38 +02:00
..
ajax	Split scanning logic from ajax file	2013-07-19 16:44:47 +02:00
appinfo	Merge branch 'master' into sabre-objecttree	2013-07-24 15:53:48 +02:00
console	remove cli check	2013-08-02 21:28:04 +02:00
css	Merge branch 'master' into oc_preview	2013-07-30 00:34:36 +02:00
js	style fixes	2013-07-30 12:33:54 +02:00
l10n	[tx-robot] updated from transifex	2013-08-02 02:00:45 -04:00
lib	if rename of file fails, the rename is undone in the view - #fix 2820	2013-06-15 09:58:27 +02:00
templates	style fixes	2013-07-30 12:33:54 +02:00
tests	if rename of file fails, the rename is undone in the view - #fix 2820	2013-06-15 09:58:27 +02:00
admin.php	Remove outdated comments	2013-01-26 14:03:17 +01:00
download.php	merge master into filesystem	2013-01-28 19:37:58 +01:00
index.php	Merge branch 'master' into oc_preview	2013-07-30 00:34:36 +02:00
settings.php	merge master into filesystem	2013-01-28 19:37:58 +01:00
triggerupdate.php	Add a CLI script for manually triggering checking a folder for updates	2013-06-23 17:49:38 +02:00