chris.watts90@outlook.com fa3a115c5c Finalized the merge.. ... Merge remote-tracking branch 'origin/CreateStaticFileHost' into UnbrokenSQLiteImplementation # Conflicts: # DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/App.config # DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Service1.cs # DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/WindowsDataCenter.csproj # DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/packages.config # DataCenter_Windows/WindowsDataCenter/WindowsDataServiceHost/App.config # DataCenter_Windows/WindowsDataCenter/WindowsDataServiceHost/packages.config		2017-02-01 20:28:42 +00:00
CardReaderService	removed args argument, was annoying.	2017-01-26 16:44:07 +00:00
DataCenter	removed interfaces reference (unused in RPI variant.)	2017-01-30 22:27:02 +00:00
DataCenter_Windows/WindowsDataCenter	Finalized the merge..	2017-02-01 20:28:42 +00:00
TestData	update the json-server file to incorporate "valid" card data, tied to the users.	2017-01-29 22:46:05 +00:00
UI	Added time log data format file.	2017-01-29 15:35:33 +00:00
.gitignore	update git-ignore to ignore node-modules packages/files.	2017-01-30 22:39:56 +00:00