Fix loading the proper template

Signed-off-by: Julius Härtl <jus@bitgrid.net>

lib/Controller/NavigationController.php

@@ -137,7 +137,7 @@ class NavigationController extends Controller {
 					$this->configService->setCloudAddress($cloudAddress);
 				} else {
 					$data['serverData']['cliUrl'] = $this->config->getSystemValue('overwrite.cli.url', \OC::$server->getURLGenerator()->getBaseUrl());
-					return new TemplateResponse(Application::APP_NAME, 'setup', $data);
+					return new TemplateResponse(Application::APP_NAME, 'main', $data);
 				}
 			}
 		}

src/views/Timeline.vue

@@ -255,7 +255,7 @@ export default {
 					$state.complete()
 					return
 				}
-				response.results.length > 0 ? $state.loaded() : $state.complete()
+				response.result.length > 0 ? $state.loaded() : $state.complete()
 			}).catch((error) => {
 				OC.Notification.showTemporary('Failed to load more timeline entries')
 				console.error('Failed to load more timeline entries', error)