From bfc193d8cd9aecdb82d585e8b4e101deac60a5bb Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 29 Mar 2018 14:48:47 +0900 Subject: Resolve conflicts --- src/server/web/app/mobile/views/components/activity.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/web/app/mobile/views/components/activity.vue') diff --git a/src/server/web/app/mobile/views/components/activity.vue b/src/server/web/app/mobile/views/components/activity.vue index b50044b3de..2e44017e77 100644 --- a/src/server/web/app/mobile/views/components/activity.vue +++ b/src/server/web/app/mobile/views/components/activity.vue @@ -29,7 +29,7 @@ export default Vue.extend({ }, mounted() { (this as any).api('aggregation/users/activity', { - user_id: this.user.id, + userId: this.user.id, limit: 30 }).then(data => { data.forEach(d => d.total = d.posts + d.replies + d.reposts); -- cgit v1.2.3-freya