Resolve conflicts

2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
--- a/src/server/api/endpoints.ts
+++ b/src/server/api/endpoints.ts
@@ -289,7 +289,7 @@ const endpoints: Endpoint[] = [
 		kind: 'notification-write'
 	},
 	{
-		name: 'notifications/mark_as_read_all',
+		name: 'notifications/markAsRead_all',
 		withCredential: true,
 		kind: 'notification-write'
 	},