e4dd24c1b0
# Conflicts: # csharp/App/Backend/DataTypes/Methods/User.cs # csharp/App/Backend/Database/Db.cs |
||
---|---|---|
.. | ||
FolderAccess.cs | ||
InstallationAccess.cs | ||
Relation.cs | ||
Session.cs |
e4dd24c1b0
# Conflicts: # csharp/App/Backend/DataTypes/Methods/User.cs # csharp/App/Backend/Database/Db.cs |
||
---|---|---|
.. | ||
FolderAccess.cs | ||
InstallationAccess.cs | ||
Relation.cs | ||
Session.cs |