hydrant 580c34f32f Merge conflicts

2018-10-28 17:30:42 +01:00

..

Admin.cs

Merge conflicts

2018-10-28 17:30:42 +01:00

Faction.cs

Fix merge conflicts

2018-10-22 20:22:45 +02:00

User.cs

Added error message when the leader logged out on /accept invite

2018-10-27 12:53:19 +02:00