| Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
# Conflicts:
# ShiftOS.Frontend/Apps/ChatClient.cs
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# ShiftOS_TheReturn/Hacking.cs
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Not done, but I need to get to sleep and this seems like a good
milestone.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# ShiftOS.WinForms/ShiftOS.WinForms.csproj
|
|
|
|
|