Georg Ehrke a357e5b284 merge conflicts ...		2013-07-10 12:41:53 +02:00
..
ajax	Merge branch 'master' into fixing-3942-master	2013-07-06 00:02:11 +02:00
appinfo	Files: use public api to register backgroundjob	2013-06-02 21:21:39 +02:00
css	merge conflicts ...	2013-07-10 12:41:53 +02:00
js	merge conflicts ...	2013-07-10 12:41:53 +02:00
l10n	[tx-robot] updated from transifex	2013-07-10 02:20:59 +02: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	merge conflicts ...	2013-07-10 12:41:53 +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	fixing Notice: Undefined index: isPublic	2013-07-05 11:30:53 +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