Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

conduwuit
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

c948324c

Commit c948324c authored 2 years ago by Timo Kösters

Downloads
- Plain Diff

Merge branch 'fix-admin-help' into 'next'

fix `@conduit help` not working in the admin room

See merge request famedly/conduit!392

parents ce188dac 7ef9fe34

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

Cargo.toml 1 addition, 1 deletion

Cargo.toml
src/api/server_server.rs 1 addition, 1 deletion

src/api/server_server.rs
src/service/admin/mod.rs 39 additions, 7 deletions

src/service/admin/mod.rs

with 41 additions and 9 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment