chris.watts90@outlook.com 81975559e2 Merge branch 'LinuxCardReaderService' into Release0.2 ... # Conflicts: # DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteRepository.cs # DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/App.config Merged Branch for linux work. Now Deploying Card Reader on RPI.		2019-09-12 09:15:34 +01:00
..
DBTestData	Add updated flexitime database	2017-04-13 10:04:22 +01:00
WindowsDataCenter	Merge branch 'LinuxCardReaderService' into Release0.2	2019-09-12 09:15:34 +01:00