Browse code Fix merge issues master
commit 15e15fc8ada2af81d3d316668a07d3d9adc0cec8 2 parents 45ceb0c + a5b5a33 MathMan05 authored on 29 Nov

Showing 35 changed files

• assets/openapi.json
• assets/schemas.json
• scripts/openapi.js
• src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts
• src/api/routes/channels/#channel_id/messages/index.ts
• src/api/routes/channels/#channel_id/recipients.ts
• src/api/routes/guilds/#guild_id/invites.ts
• src/api/routes/guilds/#guild_id/roles/#role_id/members.ts
• src/api/routes/users/#user_id/messages.ts
• src/api/routes/users/@me/mentions.ts
• src/api/routes/users/@me/settings.ts
• src/gateway/events/Close.ts
• src/gateway/opcodes/LazyRequest.ts
• src/util/entities/Channel.ts
• src/util/entities/Guild.ts
• src/util/entities/User.ts
• src/util/util/FieldError.ts
• src/util/util/KittyLogo.ts
• src/util/util/String.ts
• src/util/util/Url.ts
• src/util/util/extensions/Array.test.ts
• src/util/util/extensions/Array.ts
• src/util/util/extensions/Global.test.ts
• src/util/util/extensions/Global.ts
• src/util/util/extensions/Math.test.ts
• src/util/util/extensions/Math.ts
• src/util/util/extensions/Object.test.ts
• src/util/util/extensions/Object.ts
• src/util/util/extensions/String.test.ts
• src/util/util/extensions/String.ts
• src/util/util/extensions/Url.test.ts
• src/util/util/extensions/Url.ts
• src/util/util/extensions/index.ts
• src/util/util/index.ts
• src/util/util/lambert-server/check.ts

Ignore Space Show notes View assets/openapi.json

Ignore Space Show notes View assets/schemas.json
Not supported

Ignore Space Show notes View scripts/openapi.js

Ignore Space Show notes View src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts

Ignore Space Show notes View src/api/routes/channels/#channel_id/messages/index.ts

Ignore Space Show notes View src/api/routes/channels/#channel_id/recipients.ts

Ignore Space Show notes View src/api/routes/guilds/#guild_id/invites.ts

Ignore Space Show notes View src/api/routes/guilds/#guild_id/roles/#role_id/members.ts

Ignore Space Show notes View src/api/routes/users/#user_id/messages.ts

Ignore Space Show notes View src/api/routes/users/@me/mentions.ts

Ignore Space Show notes View src/api/routes/users/@me/settings.ts

Ignore Space Show notes View src/gateway/events/Close.ts

Ignore Space Show notes View src/gateway/opcodes/LazyRequest.ts

Ignore Space Show notes View src/util/entities/Channel.ts

Ignore Space Show notes View src/util/entities/Guild.ts

Ignore Space Show notes View src/util/entities/User.ts

Ignore Space Show notes View src/util/util/FieldError.ts

Ignore Space Show notes View src/util/util/KittyLogo.ts

Ignore Space Show notes View src/util/util/String.ts

Ignore Space Show notes View src/util/util/Url.ts 0 → 100644

Ignore Space Show notes View src/util/util/extensions/Array.test.ts

Ignore Space Show notes View src/util/util/extensions/Array.ts

Show notes View src/util/util/extensions/Global.test.ts 100644 → 0

Show notes View src/util/util/extensions/Global.ts 100644 → 0

Show notes View src/util/util/extensions/Math.test.ts 100644 → 0

Show notes View src/util/util/extensions/Math.ts 100644 → 0

Show notes View src/util/util/extensions/Object.test.ts 100644 → 0

Show notes View src/util/util/extensions/Object.ts 100644 → 0

Show notes View src/util/util/extensions/String.test.ts 100644 → 0

Show notes View src/util/util/extensions/String.ts 100644 → 0

Show notes View src/util/util/extensions/Url.test.ts 100644 → 0

Show notes View src/util/util/extensions/Url.ts 100644 → 0

Ignore Space Show notes View src/util/util/extensions/index.ts

Ignore Space Show notes View src/util/util/index.ts

Ignore Space Show notes View src/util/util/lambert-server/check.ts

Show line notes below