Merge branch 'master' into 'expired_member'
# Conflicts: # src/ldap.rs
Showing
- .gitignore 0 additions, 1 deletion.gitignore
- Cargo.lock 2531 additions, 0 deletionsCargo.lock
- src/config.rs 6 additions, 6 deletionssrc/config.rs
- src/config.ucc.yml 14 additions, 0 deletionssrc/config.ucc.yml
- src/ldap.rs 2 additions, 2 deletionssrc/ldap.rs
- src/main.rs 41 additions, 6 deletionssrc/main.rs
- src/reaction_roles.rs 12 additions, 3 deletionssrc/reaction_roles.rs
- src/token_management.rs 2 additions, 2 deletionssrc/token_management.rs
- src/user_management.rs 16 additions, 5 deletionssrc/user_management.rs
- src/voting.rs 6 additions, 8 deletionssrc/voting.rs
Please register or sign in to comment