Martin Donnelly 1dcc753561 Merge remote-tracking branch 'origin/master'
* origin/master:
  Computer history and quotes fixed

# Conflicts:
#	package-lock.json
#	package.json
#	todayV2.js
2019-09-10 09:57:42 +01:00
..
2017-10-26 10:46:54 +01:00
2019-09-10 09:56:43 +01:00
2017-10-26 10:46:54 +01:00
2019-09-10 09:56:43 +01:00
2019-03-05 17:21:22 +00:00
2017-10-26 10:46:54 +01:00
2017-10-26 10:46:54 +01:00
2017-10-26 10:46:54 +01:00
2019-09-10 09:56:43 +01:00
2017-10-26 10:46:54 +01:00
2017-10-26 10:46:54 +01:00
2019-09-10 09:56:43 +01:00
2017-10-26 10:46:54 +01:00