Thomas Müller c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches ... Conflicts: lib/private/migration/content.php		2014-02-18 18:31:33 +01:00
..
legacy	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00
job.php	Add the background job list to the public server container	2014-02-11 14:00:24 +01:00
joblist.php	Merge branch 'master' into scrutinizer_documentation_patches	2014-02-18 18:31:33 +01:00
queuedjob.php	Catch exceptions from background jobs and log them	2013-12-02 13:41:47 +01:00
timedjob.php	Catch exceptions from background jobs and log them	2013-12-02 13:41:47 +01:00