Merge remote-tracking branch 'refs/remotes/shiftos-game/master'

This commit is contained in:
lempamo 2017-02-26 15:02:19 -05:00
commit 7ba86e65c4

View file

@ -1,4 +1,4 @@
/*
/*
* MIT License
*
* Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs
@ -51,6 +51,8 @@ namespace ShiftOS.Objects
private dynamic _settings = new SettingsObject();
public int ShiftnetSubscription { get; set; }
public Guid ID { get; set; }
public bool IsMUDAdmin { get; set; }