summaryrefslogtreecommitdiffstats
path: root/server/models/conflict.js
Commit message (Expand)AuthorAgeFilesLines
* [server] New clients are automaticly added to the groups of the fitting subra...Jannik Schönartz2019-03-071-0/+23