Commit Graph

6 Commits

Author SHA1 Message Date
The3D
543c3f5c9c Merge branch 'master' into fix/62 2020-10-13 13:41:57 +02:00
David Racero
cf70929eee Merge and fix conflicts 2020-08-25 14:15:35 +02:00
David Racero
f9fddfba59 Fix conflicts 2020-08-21 17:19:25 +02:00
The3D
b13e08cfde Fixed UserConfiguration 2020-08-21 14:52:10 +02:00
The3D
028d859a54 Merge branch 'master' into feat/token-distributor-removal 2020-08-20 11:32:26 +02:00
The3D
76fcb20b44 Code cleanup 2020-08-20 09:51:21 +02:00